From 74254e47212f622242881e37776395a75cc52d0b Mon Sep 17 00:00:00 2001
From: "wagic.jeck" <wagic.jeck@01922e74-a4c3-11dd-a5cd-697bfd0a0cef>
Date: Mon, 8 Feb 2010 07:07:37 +0000
Subject: [PATCH] Jeck - Fixes to deck-viewer loading.

---
 projects/mtg/src/GameStateDeckViewer.cpp | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/projects/mtg/src/GameStateDeckViewer.cpp b/projects/mtg/src/GameStateDeckViewer.cpp
index f6129e5c2..336b0ec60 100644
--- a/projects/mtg/src/GameStateDeckViewer.cpp
+++ b/projects/mtg/src/GameStateDeckViewer.cpp
@@ -1418,11 +1418,17 @@ int GameStateDeckViewer::loadDeck(int deckid){
     MTGCard * current = myDeck->getCard(i);
     int howmanyinDeck = myDeck->count(current);
     for (int i = myCollection->count(current); i < howmanyinDeck; i++){
-      if(cheatmode)                           //Are we cheating?
-        playerdata->collection->add(current); //Yup, add it to collection.
-      else
+      if(cheatmode){                           //Are we cheating?
+        playerdata->collection->add(current); //Yup, add it to collection permanently.
+        myCollection->Add(current);
+      }
+      else{
         myDeck->Remove(current);              //Nope. Remove it from deck.
+        break;
+      }
     }
+    
+    myCollection->Remove(current,myDeck->count(current));
   }
   currentCard = NULL;
     // Load deck statistics