Fixed occasional hang when configuring VersionHandler in batch mode.

Stewart Miles · Stewart Miles · commit 9caa4da00cd6 · 2019-05-09T14:29:09.000-07:00
Change-Id: Ia1f705b40cf57a2e1bda5d433b0276dd8a6ba0a9
diff --git a/source/VersionHandlerImpl/src/VersionHandlerImpl.cs b/source/VersionHandlerImpl/src/VersionHandlerImpl.cs
@@ -1535,7 +1535,10 @@ private static void NotifyWhenCompliationComplete(bool forceNotification) {
                         Log("Compiling...", verbose: true);
                     }
                     compiling = true;
-                    return false;
+                    // In batch mode this can get stuck forever as PollOnUpdateUntilComplete()
+                    // will block the main thread which prevents the EditorApplication.isCompiling
+                    // flag from being updated by the editor.
+                    return ExecutionEnvironment.InBatchMode;
                 }
                 if (compiling) {
                     Log("Compilation complete.", verbose: true);

Original file line number	Diff line number	Diff line change
`@@ -1535,7 +1535,10 @@ private static void NotifyWhenCompliationComplete(bool forceNotification) {`
`1535`	`1535`	`Log("Compiling...", verbose: true);`
`1536`	`1536`	`}`
`1537`	`1537`	`compiling = true;`
`1538`		`- return false;`
	`1538`	`+ // In batch mode this can get stuck forever as PollOnUpdateUntilComplete()`
	`1539`	`+ // will block the main thread which prevents the EditorApplication.isCompiling`
	`1540`	`+ // flag from being updated by the editor.`
	`1541`	`+ return ExecutionEnvironment.InBatchMode;`
`1539`	`1542`	`}`
`1540`	`1543`	`if (compiling) {`
`1541`	`1544`	`Log("Compilation complete.", verbose: true);`