X-Git-Url: http://git.maemo.org/git/?p=watersofshiloah;a=blobdiff_plain;f=src%2Fmormonchannel_gtk.py;h=c29a9824ad3d4b089374a3f86020531b6ad24efc;hp=e9dc1c84557935bf3db329dc13f62728d758be79;hb=aa0e8ac26b860cad03adb0380b4701ba11f3b5db;hpb=be76b644bf353e9cdd223cb17e4c19f296190366

diff --git a/src/mormonchannel_gtk.py b/src/mormonchannel_gtk.py
index e9dc1c8..c29a982 100755
--- a/src/mormonchannel_gtk.py
+++ b/src/mormonchannel_gtk.py
@@ -2,10 +2,8 @@
 # -*- coding: utf-8 -*-
 
 """
-@todo Timezone issue with Mormon CHannel
-@todo Fix scrollto for Fremantle
 @todo backgrounds need some resizing
-@todo Icons on source selector need work
+@todo Re-use windows for better performance
 @bug For some reason, the back/close button doesn't work when I nest multiple levels
 @todo Need to confirm id's are persistent (not just for todos but broken behavior on transition)
 	@todo Track recent
@@ -111,25 +109,25 @@ class MormonChannelProgram(hildonize.get_app_class()):
 
 	@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):
-		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):
@@ -159,6 +157,8 @@ def run():
 		except KeyboardInterrupt:
 			app.quit()
 			raise
+	else:
+		app.quit()
 
 
 if __name__ == "__main__":