internal/ui: bug fix: crash on Windows

Updates #3042
hajimehoshi · Jul 15, 2024 · 38d6328 · 38d6328
1 parent 3d385ef
commit 38d6328
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/internal/ui/run.go b/internal/ui/run.go
@@ -37,12 +37,6 @@ func (u *UserInterface) runMultiThread(game Game, options *RunOptions) error {
 	u.mainThread = thread.NewOSThread()
 	graphicscommand.SetOSThreadAsRenderThread()
 
-	// Set the running state true after the main thread is set, and before initOnMainThread is called (#2742).
-	// TODO: As the existence of the main thread is the same as the value of `running`, this is redundant.
-	// Make `mainThread` atomic and remove `running` if possible.
-	u.setRunning(true)
-	defer u.setRunning(false)
-
 	u.context = newContext(game)
 
 	ctx, cancel := stdcontext.WithCancel(stdcontext.Background())
@@ -61,6 +55,12 @@ func (u *UserInterface) runMultiThread(game Game, options *RunOptions) error {
 	wg.Go(func() error {
 		defer cancel()
 
+		// Set the running state true after the main thread is set, and before initOnMainThread is called (#2742).
+		// TODO: As the existence of the main thread is the same as the value of `running`, this is redundant.
+		// Make `mainThread` atomic and remove `running` if possible.
+		u.setRunning(true)
+		defer u.setRunning(false)
+
 		var err error
 		u.mainThread.Call(func() {
 			if err1 := u.initOnMainThread(options); err1 != nil {