Fix possible race condition

ShadowTheAge · Feb 9, 2022 · 14a7e60 · 14a7e60
1 parent 155e7e6
commit 14a7e60
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/YAFC/YAFC.csproj b/YAFC/YAFC.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <LangVersion>8</LangVersion>
-        <OutputType>Exe</OutputType>
+        <OutputType>WinExe</OutputType>
         <TargetFramework>netcoreapp3.1</TargetFramework>
 		<RuntimeIdentifiers>win-x64;linux-x64;osx-x64</RuntimeIdentifiers>
 		<PlatformTarget>x64</PlatformTarget>

diff --git a/YAFCmodel/Model/ProjectPage.cs b/YAFCmodel/Model/ProjectPage.cs
@@ -83,31 +83,31 @@ protected internal override void ThisChanged(bool visualOnly)
             // Dont propagate page changes to project
         }
 
-        public Task<string> ExternalSolve()
-        {
-            currentSolvingVersion = actualVersion;
-            return content.Solve(this);
-        }
-
-        private async void RunSolveJob()
+        public async Task<string> ExternalSolve()
         {
+            if (!IsSolutionStale())
+                return modelError;
             currentSolvingVersion = actualVersion;
             try
             {
                 var error = await content.Solve(this);
                 await Ui.EnterMainThread();
-                if (modelError != error)
-                    modelError = error;
-                contentChanged?.Invoke(false);
+                return error;
             }
             finally
             {
                 await Ui.EnterMainThread();
                 lastSolvedVersion = currentSolvingVersion;
                 currentSolvingVersion = 0;
-                CheckSolve();
             }
         }
+
+        private async void RunSolveJob()
+        {
+            modelError = await ExternalSolve();
+            contentChanged?.Invoke(false);
+            CheckSolve();
+        }
     }
 
     public abstract class ProjectPageContents : ModelObject<ModelObject>