diff --git a/forge-gui-mobile/src/forge/adventure/scene/DeckEditScene.java b/forge-gui-mobile/src/forge/adventure/scene/DeckEditScene.java index 912250441c5..3773cd34413 100644 --- a/forge-gui-mobile/src/forge/adventure/scene/DeckEditScene.java +++ b/forge-gui-mobile/src/forge/adventure/scene/DeckEditScene.java @@ -35,6 +35,7 @@ public class DeckEditScene extends ForgeScene { @Override public void enter() { + screen = null; getScreen(); screen.refresh(); super.enter(); @@ -42,7 +43,11 @@ public class DeckEditScene extends ForgeScene { } @Override public FScreen getScreen() { - return screen==null?screen = new AdventureDeckEditor(false, null):screen; + if (screen==null){ + screen = new AdventureDeckEditor(false, null); + } + screen.setEvent(null); + return screen; } } diff --git a/forge-gui-mobile/src/forge/adventure/scene/DraftScene.java b/forge-gui-mobile/src/forge/adventure/scene/DraftScene.java index 4aad2532112..5626180bf52 100644 --- a/forge-gui-mobile/src/forge/adventure/scene/DraftScene.java +++ b/forge-gui-mobile/src/forge/adventure/scene/DraftScene.java @@ -38,7 +38,10 @@ public class DraftScene extends ForgeScene { } @Override public FScreen getScreen() { - return screen==null?screen = new AdventureDeckEditor(false, currentEvent):screen; + if (screen==null){ + screen = new AdventureDeckEditor(false, currentEvent); + } + return screen; } public void loadEvent(AdventureEventData event) { diff --git a/forge-gui-mobile/src/forge/adventure/scene/ShopScene.java b/forge-gui-mobile/src/forge/adventure/scene/ShopScene.java index 321f30ed12b..460b1f7a715 100644 --- a/forge-gui-mobile/src/forge/adventure/scene/ShopScene.java +++ b/forge-gui-mobile/src/forge/adventure/scene/ShopScene.java @@ -31,6 +31,7 @@ public class ShopScene extends ForgeScene { @Override public void enter() { GameHUD.getInstance().getTouchpad().setVisible(false); + screen = null; getScreen(); screen.refresh(); super.enter();