[Traverso-commit] traverso/src/core InputEngine.cpp

[Ben Levitt]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Ben Levitt <benjie>     07/07/05 19:35:10

Modified files:
        src/core       : InputEngine.cpp 

Log message:
        Fix InputEngine bug found with <EP> command.  Correctly reset the ie's 
state when doing 
        instantaneous commands.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/InputEngine.cpp?cvsroot=traverso&r1=1.64&r2=1.65

Patches:
Index: InputEngine.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/InputEngine.cpp,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -b -r1.64 -r1.65
--- InputEngine.cpp     8 Jun 2007 23:22:23 -0000       1.64
+++ InputEngine.cpp     5 Jul 2007 19:35:10 -0000       1.65
@@ -664,17 +664,20 @@
                        // Here we jump straight to the <K> command if "K" is 
unambiguously an FKEY
                        int fkey_index = find_index_for_instant_fkey(eventcode);
                        if (fkey_index >= 0) {
+                               catcher.holdTimer.stop(); // quit the holding 
check..
                                IEAction* action = m_ieActions.at(fkey_index);
                                broadcast_action(action, isAutoRepeat);
+                               conclusion();
                                return;
                        }
                } else {
                        // Here we jump straight to the <KL> command if "KL" is 
unambiguously an FKEY2
                        int fkey2_index = 
find_index_for_instant_fkey2(eventcode, eventStack[0]);
                        if (fkey2_index >= 0) {
+                               catcher.holdTimer.stop(); // quit the holding 
check..
                                IEAction* action = m_ieActions.at(fkey2_index);
                                broadcast_action(action, isAutoRepeat);
-                               reset();
+                               conclusion();
                                return;
                        }
                }