Fix not being able to resolve binary conflicts

bcssov · Jun 24, 2023 · 7e269fd · 7e269fd
1 parent 871aa0a
commit 7e269fd
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/src/IronyModManager/ViewModels/MainConflictSolverViewModel.cs b/src/IronyModManager/ViewModels/MainConflictSolverViewModel.cs
@@ -5,7 +5,7 @@
 // Created          : 03-18-2020
 //
 // Last Modified By : Mario
-// Last Modified On : 06-22-2023
+// Last Modified On : 06-24-2023
 // ***********************************************************************
 // <copyright file="MainConflictSolverViewModel.cs" company="Mario">
 //     Mario
@@ -597,15 +597,18 @@ protected virtual async Task EvaluateDefinitionValidity()
             BackAllowed = false;
             var virtualDefinitions = ModCompareSelector.VirtualDefinitions;
             var patchDefinition = virtualDefinitions.FirstOrDefault(p => modPatchCollectionService.IsPatchMod(p.ModName));
-            patchDefinition.UseSimpleValidation = false;
-            if (virtualDefinitions.Any(p => p.UseSimpleValidation == null))
+            if (patchDefinition != null)
             {
-                patchDefinition.UseSimpleValidation = null;
-            }
-            else if (virtualDefinitions.Any(p => p.UseSimpleValidation.GetValueOrDefault()))
-            {
-                patchDefinition.UseSimpleValidation = true;
-            }
+                patchDefinition.UseSimpleValidation = false;
+                if (virtualDefinitions.Any(p => p.UseSimpleValidation == null))
+                {
+                    patchDefinition.UseSimpleValidation = null;
+                }
+                else if (virtualDefinitions.Any(p => p.UseSimpleValidation.GetValueOrDefault()))
+                {
+                    patchDefinition.UseSimpleValidation = true;
+                }
+            }            
             var validationResult = modPatchCollectionService.Validate(patchDefinition);
             if (!validationResult.IsValid)
             {