From 3a86a64fce8ac9671f037ce16b845908d0120ddb Mon Sep 17 00:00:00 2001
From: Doublestrike <doublestrike@cardforge.org>
Date: Mon, 30 Jan 2012 10:50:59 +0000
Subject: [PATCH] Improved auto quest data selection between matches and
 restarts.

---
 src/main/java/forge/control/home/ControlQuest.java | 12 ++++++++----
 src/main/java/forge/view/home/ViewQuest.java       |  2 ++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/main/java/forge/control/home/ControlQuest.java b/src/main/java/forge/control/home/ControlQuest.java
index 29e309cc853..9e70f87f26c 100644
--- a/src/main/java/forge/control/home/ControlQuest.java
+++ b/src/main/java/forge/control/home/ControlQuest.java
@@ -310,6 +310,10 @@ public class ControlQuest {
         newdata.setName(questName);
         newdata.saveData();
 
+        // Save in preferences.
+        qPrefs.setPreference(QPref.CURRENT_QUEST, questName + ".dat");
+        Singletons.getModel().getQuestPreferences().save();
+
         view.getParentView().resetQuest();
     }   // New Quest
 
@@ -320,6 +324,10 @@ public class ControlQuest {
         this.qem.assembleAllEvents();
         AllZone.setQuestEventManager(this.qem);
 
+        // Save in preferences.
+        qPrefs.setPreference(QPref.CURRENT_QUEST, qData.getName() + ".dat");
+        Singletons.getModel().getQuestPreferences().save();
+
         refreshDecks();
         refreshStats();
     }
@@ -361,10 +369,6 @@ public class ControlQuest {
                 view.getLstQuests().setSelectedIndex(0);
             }
 
-            // Save in preferences.
-            qPrefs.setPreference(QPref.CURRENT_QUEST,
-                    view.getLstQuests().getSelectedQuest().getName());
-
             // Drop into AllZone.
             AllZone.setQuestData(view.getLstQuests().getSelectedQuest());
         }
diff --git a/src/main/java/forge/view/home/ViewQuest.java b/src/main/java/forge/view/home/ViewQuest.java
index 890c24c0e5a..9af18b33f62 100644
--- a/src/main/java/forge/view/home/ViewQuest.java
+++ b/src/main/java/forge/view/home/ViewQuest.java
@@ -447,6 +447,8 @@ public class ViewQuest extends JScrollPane {
             selectedOpponent = (SelectablePanel) pnlChallenges.getComponent(0);
             selectedOpponent.setBackground(skin.getColor(FSkin.Colors.CLR_ACTIVE));
         }
+
+        System.out.println(verticalScrollBar.getValue() + " challenges asdf");
     }
 
     /** Display handler for decks tab click. */