Merge branch 'fix-headless' into 'master'

Finally block blowing up when no exception is thrown.

See merge request core-developers/forge!3453

forge-gui-desktop/src/main/java/forge/view/SimulateMatch.java

@@ -172,9 +172,13 @@ public class SimulateMatch {
         } catch (Exception | StackOverflowError e) {
             e.printStackTrace();
         } finally {
-            g1.setGameOver(GameEndReason.Draw);
+            if (sw.isStarted()) {
                 sw.stop();
             }
+            if (!g1.isGameOver()) {
+                g1.setGameOver(GameEndReason.Draw);
+            }
+        }
 
         List<GameLogEntry> log;
         if (outputGamelog) {