2 files changed, 8 insertions, 4 deletions
diff --git a/NEWS b/NEWS
index 9845993..e852862 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+33
+
+* 
+
 32
 
 * Important microphone fix (Olipet)
diff --git a/TamTam.py b/TamTam.py
index 514adec..c636bd8 100755
--- a/TamTam.py
+++ b/TamTam.py
@@ -97,10 +97,6 @@ class TamTam(Activity):
         pass
     def set_mode(self, mode, arg = None):
         if Config.DEBUG: print 'DEBUG: TamTam::set_mode from', self.mode, 'to', mode
-        if mode == 'quit':
-            self.close()
-            self.destroy()
-            return
 
         if self.mode != None:
             self.modeList[ self.mode ].onDeactivate()
@@ -108,6 +104,10 @@ class TamTam(Activity):
 
         self.mode = None
         self.trackpad.setContext(mode)
+        
+        if mode == 'quit':
+            self.close() # Save and cleanup 
+            self.destroy()
 
         if mode == 'welcome':
             if not (mode in self.modeList):