From a8b7d67d9a25a03b79ba57f30ed2fb136a270836 Mon Sep 17 00:00:00 2001 From: friarsol Date: Fri, 27 Nov 2020 21:55:01 -0500 Subject: [PATCH] Finally block blowing up when no exception is thrown. --- .../src/main/java/forge/view/SimulateMatch.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/forge-gui-desktop/src/main/java/forge/view/SimulateMatch.java b/forge-gui-desktop/src/main/java/forge/view/SimulateMatch.java index 35d2a2dbc35..aaaada19b0b 100644 --- a/forge-gui-desktop/src/main/java/forge/view/SimulateMatch.java +++ b/forge-gui-desktop/src/main/java/forge/view/SimulateMatch.java @@ -172,8 +172,12 @@ public class SimulateMatch { } catch (Exception | StackOverflowError e) { e.printStackTrace(); } finally { - g1.setGameOver(GameEndReason.Draw); - sw.stop(); + if (sw.isStarted()) { + sw.stop(); + } + if (!g1.isGameOver()) { + g1.setGameOver(GameEndReason.Draw); + } } List log;