eessppeelllloo/r_e_c_u_r
1
0
Fork 0
mirror of https://github.com/cyberboy666/r_e_c_u_r.git synced 2025-12-12 11:20:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into feature_plugins

Browse Source
This commit is contained in:
Tristan Rowley
2020-02-29 13:30:11 +00:00
parent 07d2972d1a 391e8aef01
commit a8fe735478
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
user_input/numpad_input.py
View File

@@ -61,7 +61,7 @@ class NumpadInput(object):
print('the numpad action being called is {} (mode is {})'.format(this_mapping[mode][is_function], mode)) print('the numpad action being called is {} (mode is {})'.format(this_mapping[mode][is_function], mode))
if value != -1: if value != -1:
self.actions.call_method_name(this_mapping[mode][is_function], value) self.actions.call_method_name(this_mapping[mode][is_function],value)
else: else:
self.actions.call_method_name(this_mapping[mode][is_function]) self.actions.call_method_name(this_mapping[mode][is_function])

2
user_input/osc_input.py
View File

@@ -23,7 +23,7 @@ class OscInput(object):
self.poll_settings_for_osc_info() self.poll_settings_for_osc_info()
def poll_settings_for_osc_info(self): def poll_settings_for_osc_info(self):
self.data.settings['user_input'].setdefault('OSC_INPUT', self.data.settings['user_input'].setdefault('OSC_INPUT',
self.data.default_settings['user_input'].get('OSC_INPUT')) self.data.default_settings['user_input'].get('OSC_INPUT'))
osc_setting_enabled = self.data.settings['user_input']['OSC_INPUT']['value'] == 'enabled' osc_setting_enabled = self.data.settings['user_input']['OSC_INPUT']['value'] == 'enabled'
if osc_setting_enabled and not self.osc_enabled: if osc_setting_enabled and not self.osc_enabled: