diff options
| -rw-r--r-- | Edit/MainWindow.py | 7 | ||||
| -rw-r--r-- | SynthLab/SynthLabWindow.py | 5 | ||||
| -rwxr-xr-x | TamTam.py | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/Edit/MainWindow.py b/Edit/MainWindow.py index 33cec08..70b8ea9 100644 --- a/Edit/MainWindow.py +++ b/Edit/MainWindow.py @@ -77,7 +77,7 @@ class MainWindow( SubActivity ): self.trackActive = [ 1 for i in range(Config.NUMBER_OF_TRACKS) ] self.pages_playing = [] - self.journalCalled = False + self.journalCalled = True self.noteDB = NoteDB.NoteDB() TP.ProfileEnd("init_data") @@ -763,10 +763,7 @@ class MainWindow( SubActivity ): self.displayPage( id ) def handleClose(self,widget): - if self.journalCalled: - gtk.main_quit() - else: - self.set_mode("welcome") + self.set_mode('quit') def onTimeout(self): self.updateFPS() diff --git a/SynthLab/SynthLabWindow.py b/SynthLab/SynthLabWindow.py index aca3c13..d0ec415 100644 --- a/SynthLab/SynthLabWindow.py +++ b/SynthLab/SynthLabWindow.py @@ -48,7 +48,7 @@ class SynthLabWindow(SubActivity): self.duration = 2 self.durString = '%.2f' % self.duration self.playingPitch = [] - self.journalCalled = False + self.journalCalled = True loopPointsTable = [] sample_names = [name for i in range( len( Config.INSTRUMENTS ) ) for name in Config.INSTRUMENTS.keys() if Config.INSTRUMENTS[ name ].instrumentId == i ] @@ -276,7 +276,8 @@ class SynthLabWindow(SubActivity): def handleClose( self, widget, data ): if self.journalCalled: - gtk.main_quit() + self.set_mode('quit') + return if self.instanceOpen: self.synthLabParametersWindow.destroy() self.set_mode('welcome') @@ -97,10 +97,12 @@ 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.save() + self.destroy() + return if self.mode != None: - if self.mode == "edit" or self.mode == "synth": - self.save() # save the activity self.modeList[ self.mode ].onDeactivate() self.remove( self.modeList[ self.mode ] ) |