From 91abbcd3c5ed458787f60b68f652f6728bc3cfd6 Mon Sep 17 00:00:00 2001 From: Anthony Calosa Date: Thu, 19 Sep 2019 04:31:42 +0000 Subject: [PATCH] Fix setloadingaMatch prematurely, if the startgame is null there must be an error/showdialog happened. --- .../src/forge/screens/constructed/LobbyScreen.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/forge-gui-mobile/src/forge/screens/constructed/LobbyScreen.java b/forge-gui-mobile/src/forge/screens/constructed/LobbyScreen.java index d9b8c2dc78d..b111fa139f4 100644 --- a/forge-gui-mobile/src/forge/screens/constructed/LobbyScreen.java +++ b/forge-gui-mobile/src/forge/screens/constructed/LobbyScreen.java @@ -272,13 +272,13 @@ public abstract class LobbyScreen extends LaunchScreen implements ILobbyView { updateDeck(i);//TODO: Investigate why AI names cannot be overriden? updateName(i, getPlayerName(i)); } - //set this so we cant get any multi/rapid tap on start button - Forge.setLoadingaMatch(true); FThreads.invokeInBackgroundThread(new Runnable() { //must call startGame in background thread in case there are alerts @Override public void run() { final Runnable startGame = lobby.startGame(); if (startGame != null) { + //set this so we cant get any multi/rapid tap on start button + Forge.setLoadingaMatch(true); FThreads.invokeInEdtLater(new Runnable() { @Override public void run() {