diff --git a/forge-gui-mobile/src/forge/screens/home/HomeScreen.java b/forge-gui-mobile/src/forge/screens/home/HomeScreen.java index 4359404e3a5..c6cc0253111 100644 --- a/forge-gui-mobile/src/forge/screens/home/HomeScreen.java +++ b/forge-gui-mobile/src/forge/screens/home/HomeScreen.java @@ -46,7 +46,7 @@ public class HomeScreen extends FScreen { addButton("Quest Mode", new FEventHandler() { @Override public void handleEvent(FEvent e) { - QuestMenu.launchQuestMode(); + QuestMenu.launchQuestMode(false); } }, true); addButton("Gauntlets", new FEventHandler() { diff --git a/forge-gui-mobile/src/forge/screens/quest/LoadQuestScreen.java b/forge-gui-mobile/src/forge/screens/quest/LoadQuestScreen.java index a5ef7b9d485..0d7a53f7a84 100644 --- a/forge-gui-mobile/src/forge/screens/quest/LoadQuestScreen.java +++ b/forge-gui-mobile/src/forge/screens/quest/LoadQuestScreen.java @@ -167,7 +167,7 @@ public class LoadQuestScreen extends FScreen { FModel.getQuestPreferences().setPref(QPref.CURRENT_QUEST, lstQuests.getSelectedQuest().getName() + ".dat"); FModel.getQuestPreferences().save(); - QuestMenu.launchQuestMode(); + QuestMenu.launchQuestMode(true); } private void renameQuest(final QuestData quest) { diff --git a/forge-gui-mobile/src/forge/screens/quest/NewQuestScreen.java b/forge-gui-mobile/src/forge/screens/quest/NewQuestScreen.java index 3b22dad22e2..3121b6d0d26 100644 --- a/forge-gui-mobile/src/forge/screens/quest/NewQuestScreen.java +++ b/forge-gui-mobile/src/forge/screens/quest/NewQuestScreen.java @@ -536,7 +536,7 @@ public class NewQuestScreen extends FScreen { FModel.getQuestPreferences().setPref(QPref.CURRENT_QUEST, questName + ".dat"); FModel.getQuestPreferences().save(); - QuestMenu.launchQuestMode(); //launch quest mode for new quest + QuestMenu.launchQuestMode(true); //launch quest mode for new quest } }); } diff --git a/forge-gui-mobile/src/forge/screens/quest/QuestMenu.java b/forge-gui-mobile/src/forge/screens/quest/QuestMenu.java index dc14afc1baf..71026d8fde7 100644 --- a/forge-gui-mobile/src/forge/screens/quest/QuestMenu.java +++ b/forge-gui-mobile/src/forge/screens/quest/QuestMenu.java @@ -118,7 +118,7 @@ public class QuestMenu extends FPopupMenu implements IVQuestStats { private QuestMenu() { } - public static void launchQuestMode() { + public static void launchQuestMode(final boolean fromQuestChange) { //attempt to load current quest final File dirQuests = new File(ForgeConstants.QUEST_SAVE_DIR); final String questname = FModel.getQuestPreferences().getPref(QPref.CURRENT_QUEST); @@ -128,11 +128,16 @@ public class QuestMenu extends FPopupMenu implements IVQuestStats { @Override public void run() { FModel.getQuest().load(QuestDataIO.loadData(data)); - duelsScreen.update(); - challengesScreen.update(); - tournamentsScreen.update(); - decksScreen.refreshDecks(); - Forge.openScreen(duelsScreen); //TODO: Consider opening most recent quest view + if (fromQuestChange) { + duelsScreen.update(); + challengesScreen.update(); + tournamentsScreen.update(); + decksScreen.refreshDecks(); + Forge.back(); + } + else { + Forge.openScreen(duelsScreen); //TODO: Consider opening most recent quest view + } } }); return;