Making Ctrl+C friendlier and profiling friendlier

[watersofshiloah] / src / mormonchannel_gtk.py

diff --git a/src/mormonchannel_gtk.py b/src/mormonchannel_gtk.py
index 40727ab..c29a982 100755 (executable)
--- a/src/mormonchannel_gtk.py
+++ b/src/mormonchannel_gtk.py
@@ -2,8 +2,9 @@
 # -*- coding: utf-8 -*-
 
 """
-@bug Fix segfault on closing of window while playing
-@todo Add images for Magazines and Issues
+@todo backgrounds need some resizing
+@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
        @todo Persisted Pause
@@ -54,6 +55,7 @@ class MormonChannelProgram(hildonize.get_app_class()):
                self._index = stream_index.AudioIndex()
                self._player = player.Player(self._index)
 
+               self._store.start()
                self._index.start()
                try:
                        if not hildonize.IS_HILDON_SUPPORTED:
@@ -68,12 +70,14 @@ class MormonChannelProgram(hildonize.get_app_class()):
                                self._osso_c = None
                                self._deviceState = None
 
-                       self._sourceSelector = windows.source.SourceSelector(self._player, self._store, self._index)
+                       self._sourceSelector = windows.source.SourceSelector(self, self._player, self._store, self._index)
                        self._sourceSelector.window.connect("destroy", self._on_destroy)
+                       self._sourceSelector.window.set_default_size(400, 800)
                        self._sourceSelector.show()
                        self._load_settings()
                except:
                        self._index.stop()
+                       self._store.stop()
                        raise
 
        def _save_settings(self):
@@ -105,24 +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._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):
@@ -152,6 +157,8 @@ def run():
                except KeyboardInterrupt:
                        app.quit()
                        raise
+       else:
+               app.quit()
 
 
 if __name__ == "__main__":