Fix: ModeModifier without timeout crashes Modeshift editor. Fixes #49

kozec · Jul 1, 2016 · 446af9a · 446af9a
1 parent 20f5a28
commit 446af9a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/scc/gui/modeshift_editor.py b/scc/gui/modeshift_editor.py
@@ -262,6 +262,8 @@ def _make_action(self):
 			action.holdaction = holdaction
 		elif holdaction:
 			action = HoldModifier(holdaction, normalaction)
+		else:
+			action = normalaction
 		action.timeout = self.builder.get_object("adjTime").get_value()
 		return action
 

diff --git a/scc/modifiers.py b/scc/modifiers.py
@@ -235,6 +235,8 @@ def __init__(self, *stuff):
 		self.held_triggers = {}
 		self.order = []
 		self.old_gyro = None
+		self.timeout = DoubleclickModifier.DEAFAULT_TIMEOUT
+
 		button = None
 		for i in stuff:
 			if self.default is not None: