From 9074b79c2917bedaabea743aac483314ae9002bc Mon Sep 17 00:00:00 2001
From: drdev <drdev@cardforge.org>
Date: Thu, 23 Apr 2015 05:05:36 +0000
Subject: [PATCH] Scroll selected quest into view Fix so new quest screen
 removed from flow Prevent load quest screen getting stale

---
 .../forge/screens/planarconquest/LoadConquestScreen.java  | 1 +
 .../src/forge/screens/quest/LoadQuestScreen.java          | 8 ++++++++
 forge-gui-mobile/src/forge/screens/quest/QuestMenu.java   | 6 ++++++
 3 files changed, 15 insertions(+)

diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/LoadConquestScreen.java b/forge-gui-mobile/src/forge/screens/planarconquest/LoadConquestScreen.java
index b52397b64b0..010364c404b 100644
--- a/forge-gui-mobile/src/forge/screens/planarconquest/LoadConquestScreen.java
+++ b/forge-gui-mobile/src/forge/screens/planarconquest/LoadConquestScreen.java
@@ -124,6 +124,7 @@ public class LoadConquestScreen extends LaunchScreen {
                         lblOldConquests.setText("Old conquest data? Put into \""
                                 + ForgeConstants.CONQUEST_SAVE_DIR.replace('\\', '/') + "\" and restart Forge.");
                         revalidate();
+                        lstConquests.scrollIntoView(lstConquests.selectedIndex);
                     }
                 });
             }
diff --git a/forge-gui-mobile/src/forge/screens/quest/LoadQuestScreen.java b/forge-gui-mobile/src/forge/screens/quest/LoadQuestScreen.java
index e2a1c9bbc30..887234f79d6 100644
--- a/forge-gui-mobile/src/forge/screens/quest/LoadQuestScreen.java
+++ b/forge-gui-mobile/src/forge/screens/quest/LoadQuestScreen.java
@@ -78,6 +78,13 @@ public class LoadQuestScreen extends LaunchScreen {
                 deleteQuest(lstQuests.getSelectedQuest());
             }
         });
+    }
+
+    @Override
+    public void onActivate() {
+        lblOldQuests.setText("Loading Existing Quests...");
+        lstQuests.clear();
+        revalidate();
 
         FThreads.invokeInBackgroundThread(new Runnable() {
             @Override
@@ -125,6 +132,7 @@ public class LoadQuestScreen extends LaunchScreen {
                         lblOldQuests.setText("Old quest data? Put into \""
                                 + ForgeConstants.QUEST_SAVE_DIR.replace('\\', '/') + "\" and restart Forge.");
                         revalidate();
+                        lstQuests.scrollIntoView(lstQuests.selectedIndex);
                     }
                 });
             }
diff --git a/forge-gui-mobile/src/forge/screens/quest/QuestMenu.java b/forge-gui-mobile/src/forge/screens/quest/QuestMenu.java
index b58c806ab6f..a8a7a774f35 100644
--- a/forge-gui-mobile/src/forge/screens/quest/QuestMenu.java
+++ b/forge-gui-mobile/src/forge/screens/quest/QuestMenu.java
@@ -174,7 +174,13 @@ public class QuestMenu extends FPopupMenu implements IVQuestStats {
                         challengesScreen.update();
                         tournamentsScreen.update();
                         decksScreen.refreshDecks();
+                        if (reason == LaunchReason.NewQuest) {
+                            Forge.back();
+                        }
                         Forge.openScreen(duelsScreen);
+                        if (reason == LaunchReason.NewQuest) {
+                            LoadGameScreen.QuestMode.setAsBackScreen();
+                        }
                     }
                 }
             });