diff --git a/forge-gui-mobile/src/forge/adventure/scene/GameScene.java b/forge-gui-mobile/src/forge/adventure/scene/GameScene.java index 7e1dd138d06..dc18cf2dc07 100644 --- a/forge-gui-mobile/src/forge/adventure/scene/GameScene.java +++ b/forge-gui-mobile/src/forge/adventure/scene/GameScene.java @@ -2,6 +2,7 @@ package forge.adventure.scene; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.graphics.GL20; +import forge.Forge; import forge.adventure.stage.WorldStage; /** @@ -42,5 +43,11 @@ public class GameScene extends HudScene { } + + @Override + public void enter() { + Forge.clearTransitionScreen(); + super.enter(); + } } diff --git a/forge-gui-mobile/src/forge/adventure/scene/SaveLoadScene.java b/forge-gui-mobile/src/forge/adventure/scene/SaveLoadScene.java index 645924fba54..edee419795f 100644 --- a/forge-gui-mobile/src/forge/adventure/scene/SaveLoadScene.java +++ b/forge-gui-mobile/src/forge/adventure/scene/SaveLoadScene.java @@ -106,16 +106,18 @@ public class SaveLoadScene extends UIScene { dialog.show(stage); stage.setKeyboardFocus(textInput); } else { - Runnable runnable = new Runnable() { - @Override - public void run() { - if(WorldSave.load(currentSlot)) { - Forge.clearTransitionScreen(); + if (WorldSave.load(currentSlot)) { + Runnable runnable = new Runnable() { + @Override + public void run() { Forge.switchScene(SceneType.GameScene.instance); } - } - }; - Forge.setTransitionScreen(new TransitionScreen(runnable, null, false, true)); + }; + Forge.setTransitionScreen(new TransitionScreen(runnable, null, false, true)); + } else { + Forge.clearTransitionScreen(); + } + } } diff --git a/forge-gui-mobile/src/forge/adventure/world/WorldSave.java b/forge-gui-mobile/src/forge/adventure/world/WorldSave.java index 3f46a1d2621..f0c21dc493b 100644 --- a/forge-gui-mobile/src/forge/adventure/world/WorldSave.java +++ b/forge-gui-mobile/src/forge/adventure/world/WorldSave.java @@ -4,7 +4,6 @@ import forge.Forge; import forge.adventure.data.DifficultyData; import forge.adventure.player.AdventurePlayer; import forge.adventure.pointofintrest.PointOfInterestChanges; -import forge.adventure.scene.SceneType; import forge.adventure.stage.WorldStage; import forge.adventure.util.Config; import forge.adventure.util.SaveFileData; @@ -77,13 +76,9 @@ public class WorldSave { currentSave.onLoadList.emit(); } - } catch (Exception e) { + } catch (ClassNotFoundException | IOException e) { e.printStackTrace(); - Forge.clearTransitionScreen(); - Forge.switchScene(SceneType.SaveLoadScene.instance); return false; - } finally { - } return true; }