From 4a8616656818de02d098896583ffbe9841e44d09 Mon Sep 17 00:00:00 2001
From: "wagic.jeck" <wagic.jeck@01922e74-a4c3-11dd-a5cd-697bfd0a0cef>
Date: Wed, 3 Feb 2010 20:18:06 +0000
Subject: [PATCH] Jeck - Potential fixes for issue 312.

---
 projects/mtg/include/GameStateTransitions.h | 1 +
 projects/mtg/src/GameStateTransitions.cpp   | 5 +++--
 projects/mtg/src/Tasks.cpp                  | 5 ++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/projects/mtg/include/GameStateTransitions.h b/projects/mtg/include/GameStateTransitions.h
index f4a4631b7..aa9ed83eb 100644
--- a/projects/mtg/include/GameStateTransitions.h
+++ b/projects/mtg/include/GameStateTransitions.h
@@ -8,6 +8,7 @@
 class TransitionBase: public GameState, public JGuiListener{
 public:
   TransitionBase(GameApp* parent, GameState* _from, GameState* _to, float duration);
+  ~TransitionBase();
   virtual void Start();
   virtual void End();
 
diff --git a/projects/mtg/src/GameStateTransitions.cpp b/projects/mtg/src/GameStateTransitions.cpp
index f717bcbdb..f6826f51d 100644
--- a/projects/mtg/src/GameStateTransitions.cpp
+++ b/projects/mtg/src/GameStateTransitions.cpp
@@ -35,12 +35,13 @@ void TransitionBase::Start() {
 
 void TransitionBase::End() {
   mElapsed = 0;
+};
+TransitionBase::~TransitionBase(){
   if(!bAnimationOnly){
     if(from)
       from->End();
   }
-};
-
+}
 void TransitionFade::Render(){
   if(from)
     from->Render();
diff --git a/projects/mtg/src/Tasks.cpp b/projects/mtg/src/Tasks.cpp
index 1662719d5..1bc622cc3 100644
--- a/projects/mtg/src/Tasks.cpp
+++ b/projects/mtg/src/Tasks.cpp
@@ -359,6 +359,8 @@ void TaskList::Start(){
   mState = TASKS_IN;
   if(!mBgTex){
     mBgTex = resources.RetrieveTexture("taskboard.png");
+    for(int i=0;i<9;i++)
+      SAFE_DELETE(mBg[i]);
     if(mBgTex){
     mBg[0] = NEW JQuad(mBgTex,0,0,64,64);
     mBg[1] = NEW JQuad(mBgTex,64,0,128,64);
@@ -370,9 +372,6 @@ void TaskList::Start(){
     mBg[7] = NEW JQuad(mBgTex,64,192,128,64);
     mBg[8] = NEW JQuad(mBgTex,192,192,64,64);
     }
-    else
-      for(int i=0;i<9;i++)
-        SAFE_DELETE(mBg[i]);
   }
 }
 void TaskList::End(){