diff options
| author | amartin <olpc@xo-00-CE-12.localdomain> | 2007-07-06 15:54:06 (GMT) |
|---|---|---|
| committer | amartin <olpc@xo-00-CE-12.localdomain> | 2007-07-06 15:54:06 (GMT) |
| commit | 79f4a80f5fb50d5c7dc6cb88c3ad1c9bd1faac05 (patch) | |
| tree | dee679a276ca0cfec656287ec610cc4b9ee68ff1 /Edit | |
| parent | e1413b33f821b6334ca2b30f27cd281a26fded86 (diff) | |
| parent | 959909b9f9bd2b71c7e62f0f5bb5ef65df4ab32d (diff) | |
merge conflict
Diffstat (limited to 'Edit')
| -rw-r--r-- | Edit/MainWindow.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Edit/MainWindow.py b/Edit/MainWindow.py index ea1db91..4a4b23c 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() @@ -1473,7 +1477,7 @@ class MainWindow( SubActivity ): self.delay = gobject.timeout_add(1000, self.waitToSet) def handleJournalLoad(self,file_path): - + self.journalCalled = True self._loadFile( file_path ) #----------------------------------- |