diff --git a/data_centre/data.py b/data_centre/data.py index 236e4db..dfd8fcb 100644 --- a/data_centre/data.py +++ b/data_centre/data.py @@ -69,7 +69,8 @@ class Data(object): self.shader_bank_data = [self.create_empty_shader_bank() for i in range(3)] if os.path.isfile(self.PATH_TO_DATA_OBJECTS + self.SHADER_BANK_DATA_JSON): self.shader_bank_data = self._read_json(self.SHADER_BANK_DATA_JSON) - self.settings = self.default_settings = self._read_json(self.DEFAULT_SETTINGS_JSON) + self.settings = self._read_json(self.DEFAULT_SETTINGS_JSON) + self.default_settings = self.settings.copy() if os.path.isfile(self.PATH_TO_DATA_OBJECTS + self.SETTINGS_JSON): self.settings = self._read_json(self.SETTINGS_JSON) diff --git a/user_input/numpad_input.py b/user_input/numpad_input.py index dd3c765..bada2cd 100644 --- a/user_input/numpad_input.py +++ b/user_input/numpad_input.py @@ -36,7 +36,9 @@ class NumpadInput(object): self.check_key_release_settings(event.char) def on_mouse_move(self, event): - if self.data.settings['user_input']['MOUSE_INPUT']['value'] != 'enabled': + if self.data.settings['user_input'].setdefault( + 'MOUSE_INPUT', + self.data.default_settings.get('MOUSE_INPUT',{'value': 'enabled'})).get('value') != 'enabled': return if event.x > 480 or event.y > 320: return