diff options
| -rw-r--r-- | Edit/MainWindow.py | 7 | ||||
| -rw-r--r-- | SynthLab/SynthLabWindow.py | 3 | ||||
| -rw-r--r-- | activity/NEWS | 3 |
3 files changed, 12 insertions, 1 deletions
diff --git a/Edit/MainWindow.py b/Edit/MainWindow.py index 89ae84b..3b18748 100644 --- a/Edit/MainWindow.py +++ b/Edit/MainWindow.py @@ -77,6 +77,7 @@ class MainWindow( SubActivity ): self.trackActive = [ 1 for i in range(Config.NUMBER_OF_TRACKS) ] self.pages_playing = [] + self.journalCalled = False self.noteDB = NoteDB.NoteDB() TP.ProfileEnd("init_data") @@ -762,7 +763,10 @@ class MainWindow( SubActivity ): self.displayPage( id ) def handleClose(self,widget): - self.set_mode("welcome") + if self.journalCalled: + gtk.main_quit() + else: + self.set_mode("welcome") def onTimeout(self): self.updateFPS() @@ -1480,6 +1484,7 @@ class MainWindow( SubActivity ): self.delay = gobject.timeout_add(1000, self.waitToSet) def handleJournalLoad(self,file_path): + self.journalCalled = True self.noteDB.deletePages( self.noteDB.pages.keys() ) ifile = open(file_path, 'r') diff --git a/SynthLab/SynthLabWindow.py b/SynthLab/SynthLabWindow.py index 02bf08e..aca3c13 100644 --- a/SynthLab/SynthLabWindow.py +++ b/SynthLab/SynthLabWindow.py @@ -48,6 +48,7 @@ class SynthLabWindow(SubActivity): self.duration = 2 self.durString = '%.2f' % self.duration self.playingPitch = [] + self.journalCalled = False loopPointsTable = [] sample_names = [name for i in range( len( Config.INSTRUMENTS ) ) for name in Config.INSTRUMENTS.keys() if Config.INSTRUMENTS[ name ].instrumentId == i ] @@ -274,6 +275,8 @@ class SynthLabWindow(SubActivity): if self.recCount >= 9: self.recCount = 0 def handleClose( self, widget, data ): + if self.journalCalled: + gtk.main_quit() if self.instanceOpen: self.synthLabParametersWindow.destroy() self.set_mode('welcome') diff --git a/activity/NEWS b/activity/NEWS index 116a564..806a0d6 100644 --- a/activity/NEWS +++ b/activity/NEWS @@ -1,3 +1,6 @@ +30 +=== + 29 === -WelcomeScreen: Removed Typing Game icon |