From f9aeecf1a00e0e632546db00cb0cfa31b078dbe9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Mon, 19 Sep 2016 19:58:54 +0200 Subject: Don't lock the application when failing while reloading configuration --- music_sampler/mapping.py | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/music_sampler/mapping.py b/music_sampler/mapping.py index 5c61f8a..a526ad2 100644 --- a/music_sampler/mapping.py +++ b/music_sampler/mapping.py @@ -72,9 +72,9 @@ class Mapping(RelativeLayout): self.keyboard = Window.request_keyboard(self.on_keyboard_closed, self) self.keyboard.bind(on_key_down=self.on_keyboard_down) - self.configure() + self.configure(initial=True) - def on_enter_configuring(self): + def on_enter_configuring(self, initial=True): if Config.builtin_mixing: self.mixer = Mixer() else: @@ -84,9 +84,9 @@ class Mapping(RelativeLayout): self.key_config, self.open_files = self.parse_config() except Exception as e: error_print("Error while loading configuration: {}".format(e), - with_trace=True, exit=True) - else: - self.success() + with_trace=False, exit=initial) + + self.success() def on_enter_loading(self): for key in self.keys: @@ -118,7 +118,7 @@ class Mapping(RelativeLayout): self.leave_application() sys.exit() elif 'ctrl' in modifiers and keycode[0] == 114 and self.is_loaded(): - self.reload() + self.reload(initial=False) return True def leave_application(self): @@ -348,13 +348,11 @@ class Mapping(RelativeLayout): try: config = yaml.safe_load(stream) except Exception as e: - error_print("Error while loading config file: {}".format(e), - exit=True) + raise Exception("Error while loading config file: {}".format(e)) from e stream.close() if not isinstance(config, dict): - error_print("Top level config is supposed to be a hash", - exit=True) + raise Exception("Top level config is supposed to be a hash") if 'aliases' in config and isinstance(config['aliases'], dict): aliases = config['aliases'] -- cgit v1.2.3