Merge pull request #994 from peppy/fix-disposal-threading

Ensure all threads are stopped before disposing the scene graph
ppy · Aug 23, 2017 · e2d4182 · e2d4182
2 parents ed09e76 + fa970c3
commit e2d4182
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/osu.Framework/Platform/GameHost.cs b/osu.Framework/Platform/GameHost.cs
@@ -537,10 +537,12 @@ private void setVSyncMode()
 
         protected virtual void Dispose(bool disposing)
         {
-            if (!isDisposed)
-            {
-                isDisposed = true;
-            }
+            if (isDisposed)
+                return;
+
+            isDisposed = true;
+            stopAllThreads();
+            Root?.Dispose();
         }
 
         ~GameHost()
@@ -552,8 +554,6 @@ public void Dispose()
         {
             Dispose(true);
             GC.SuppressFinalize(this);
-
-            Root?.Dispose();
         }
 
         #endregion