projects
/
watersofshiloah
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
ba0a385
)
Making Ctrl+C friendlier and profiling friendlier
author
Ed Page
<eopage@byu.net>
Tue, 18 May 2010 11:52:13 +0000
(06:52 -0500)
committer
Ed Page
<eopage@byu.net>
Tue, 18 May 2010 11:52:13 +0000
(06:52 -0500)
src/mormonchannel_gtk.py
patch
|
blob
|
history
diff --git
a/src/mormonchannel_gtk.py
b/src/mormonchannel_gtk.py
index
5eafe64
..
c29a982
100755
(executable)
--- a/
src/mormonchannel_gtk.py
+++ b/
src/mormonchannel_gtk.py
@@
-109,25
+109,25
@@
class MormonChannelProgram(hildonize.get_app_class()):
@misc_utils.log_exception(_moduleLogger)
def _on_destroy(self, widget = None, data = None):
@misc_utils.log_exception(_moduleLogger)
def _on_destroy(self, widget = None, data = None):
- self.quit()
+ try:
+ self.quit()
+ finally:
+ gtk.main_quit()
def quit(self):
def quit(self):
- try:
- self._save_settings()
+ self._save_settings()
- self._index.stop()
- self._store.stop()
+ self._index.stop()
+ self._store.stop()
- try:
- self._deviceState.close()
- except AttributeError:
- pass # Either None or close was removed (in Fremantle)
- try:
- self._osso_c.close()
- except AttributeError:
- pass # Either None or close was removed (in Fremantle)
- finally:
- gtk.main_quit()
+ try:
+ self._deviceState.close()
+ except AttributeError:
+ pass # Either None or close was removed (in Fremantle)
+ try:
+ self._osso_c.close()
+ except AttributeError:
+ pass # Either None or close was removed (in Fremantle)
@misc_utils.log_exception(_moduleLogger)
def _on_show_about(self, widget = None, data = None):
@misc_utils.log_exception(_moduleLogger)
def _on_show_about(self, widget = None, data = None):
@@
-157,6
+157,8
@@
def run():
except KeyboardInterrupt:
app.quit()
raise
except KeyboardInterrupt:
app.quit()
raise
+ else:
+ app.quit()
if __name__ == "__main__":
if __name__ == "__main__":