From ded513faed372b9df6fad80b1482408b61b10132 Mon Sep 17 00:00:00 2001
From: Johannes Knutsen <johannes@iterate.no>
Date: Thu, 9 Jun 2011 20:04:05 +0200
Subject: [PATCH] Catch keyboard interrupts in all core setup methods

---
 mopidy/core.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/mopidy/core.py b/mopidy/core.py
index e8857b94..98575478 100644
--- a/mopidy/core.py
+++ b/mopidy/core.py
@@ -28,15 +28,15 @@ from mopidy.utils.settings import list_settings_optparse_callback
 logger = logging.getLogger('mopidy.core')
 
 def main():
-    options = parse_options()
-    setup_logging(options.verbosity_level, options.save_debug_log)
-    setup_settings(options.interactive)
-    setup_gobject_loop()
-    setup_gstreamer()
-    setup_mixer()
-    setup_backend()
-    setup_frontends()
     try:
+        options = parse_options()
+        setup_logging(options.verbosity_level, options.save_debug_log)
+        setup_settings(options.interactive)
+        setup_gobject_loop()
+        setup_gstreamer()
+        setup_mixer()
+        setup_backend()
+        setup_frontends()
         while ActorRegistry.get_all():
             time.sleep(1)
         logger.info(u'No actors left. Exiting...')