From 94ce5864ada2e578b9e9fc14160a232f4e3480bc Mon Sep 17 00:00:00 2001
From: Doublestrike <doublestrike@cardforge.org>
Date: Wed, 1 Feb 2012 03:49:43 +0000
Subject: [PATCH] Bugfix: Pet select cleared before new quest loaded Bugfix:
 Pet select remembers previous pet

---
 src/main/java/forge/control/home/ControlQuest.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/forge/control/home/ControlQuest.java b/src/main/java/forge/control/home/ControlQuest.java
index 673f6145de1..518d239bab8 100644
--- a/src/main/java/forge/control/home/ControlQuest.java
+++ b/src/main/java/forge/control/home/ControlQuest.java
@@ -334,7 +334,6 @@ public class ControlQuest {
     private void changeQuest() {
         AllZone.setQuestData(view.getLstQuests().getSelectedQuest());
         this.qData = AllZone.getQuestData();
-        this.qem = new QuestEventManager();
         this.qem.assembleAllEvents();
         AllZone.setQuestEventManager(this.qem);
 
@@ -444,6 +443,7 @@ public class ControlQuest {
             final Set<String> petList = this.qData.getPetManager().getAvailablePetNames();
             final QuestPetAbstract currentPet = this.qData.getPetManager().getSelectedPet();
 
+            view.getCbxPet().removeAllItems();
             // Pet list visibility
             if (petList.size() > 0) {
                 view.getCbxPet().setEnabled(true);
@@ -452,7 +452,7 @@ public class ControlQuest {
                     view.getCbxPet().addItem("Summon " + pet);
                 }
 
-                if (currentPet != null) { view.getCbxPet().setSelectedItem(currentPet.getName()); }
+                if (currentPet != null) { view.getCbxPet().setSelectedItem("Summon " + currentPet.getName()); }
             } else {
                 view.getCbxPet().setVisible(false);
             }