From 7a98f224feb92d9cac6a0af6887ef772be4a8a74 Mon Sep 17 00:00:00 2001
From: William Kendrick <wkendrick@users.sourceforge.net>
Date: Mon, 23 Feb 2009 00:13:37 +0000
Subject: [PATCH] Not calling magic_switchin() if we're about to quit...

---
 docs/CHANGES.txt |  7 ++++++-
 src/tuxpaint.c   | 17 +++++++++++------
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt
index f21aeda91..4b04a385e 100644
--- a/docs/CHANGES.txt
+++ b/docs/CHANGES.txt
@@ -8,7 +8,7 @@ http://www.tuxpaint.org/
 
 $Id$
 
-2009.February.21 (0.9.21)
+2009.February.22 (0.9.21)
   * New Starters:
     -------------
     * Silver Frame
@@ -118,6 +118,11 @@ $Id$
 
     * Updated to the latest version (2.27) of DejaVu Sans Regular for UI font.
 
+  * Bug Fixes:
+    ----------
+    * Was inadvertently calling "magic_switchin()" on Quit. Fixed.
+      Dan Shields <d4ndeveloper@gmail.com>
+
   * New localizations:
     ------------------
     * Shuswap (Secwepemctín) translation
diff --git a/src/tuxpaint.c b/src/tuxpaint.c
index 6e8fe5aa4..8771f61b0 100644
--- a/src/tuxpaint.c
+++ b/src/tuxpaint.c
@@ -22,7 +22,7 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   (See COPYING.txt)
   
-  June 14, 2002 - January 2, 2009
+  June 14, 2002 - February 22, 2009
   $Id$
 */
 
@@ -1983,7 +1983,8 @@ static void mainloop(void)
       {
         magic_switchout(canvas);
 	done = do_quit(cur_tool);
-        magic_switchin(canvas);
+        if (!done)
+          magic_switchin(canvas);
       }
       else if (event.type == SDL_ACTIVEEVENT)
       {
@@ -2006,7 +2007,8 @@ static void mainloop(void)
 	{
           magic_switchout(canvas);
 	  done = do_quit(cur_tool);
-          magic_switchin(canvas);
+          if (!done)
+            magic_switchin(canvas);
 	}
 	else if (key == SDLK_s && (mod & KMOD_ALT))
 	{
@@ -2034,14 +2036,16 @@ static void mainloop(void)
 	{
           magic_switchout(canvas);
 	  done = do_quit(cur_tool);
-          magic_switchin(canvas);
+          if (!done)
+            magic_switchin(canvas);
 	}
 #ifdef WIN32
 	else if (key == SDLK_F4 && (mod & KMOD_ALT))
 	{
           magic_switchout(canvas);
 	  done = do_quit(cur_tool);
-          magic_switchin(canvas);
+          if (!done)
+            magic_switchin(canvas);
 	}
 #endif
 	else if (key == SDLK_z && (mod & KMOD_CTRL) && !noshortcuts)
@@ -2701,7 +2705,8 @@ static void mainloop(void)
 	    update_screen_rect(&r_ttoolopt);
 	  }
 
-          magic_switchin(canvas);
+          if (!done)
+            magic_switchin(canvas);
 	}
 	else if (HIT(r_toolopt) && valid_click(event.button.button))
 	{