Merge 0012596 into aead5ce

CyrilleB79 · web-flow · commit 0c4a2c443164 · 2020-10-16T07:23:51.000+10:00
diff --git a/source/inputCore.py b/source/inputCore.py
@@ -492,7 +492,12 @@ def executeGesture(self, gesture):
 			queueHandler.queueFunction(queueHandler.eventQueue, speech.speakMessage, gesture.displayName)
 
 		gesture.reportExtra()
-
+		
+		# Clear memorized last script to avoid getLastScriptRepeatCount return multiple press
+		# when an unbound gesture is executed between 2 bound gestures.
+		if not script:
+			scriptHandler.clearLastScript()
+		
 		# #2953: if an intercepted command Script (script that sends a gesture) is queued
 		# then queue all following gestures (that don't have a script) with a fake script so that they remain in order.
 		if not script and scriptHandler._numIncompleteInterceptedCommandScripts:
diff --git a/source/scriptHandler.py b/source/scriptHandler.py
@@ -224,6 +224,11 @@ def getLastScriptRepeatCount():
 	else:
 		return _lastScriptCount
 
+def clearLastScript():
+	global _lastScriptRef, _lastScriptCount
+	_lastScriptRef = None
+	_lastScriptCount = 0
+
 def isScriptWaiting():
 	return bool(_numScriptsQueued)
 
