Fixed sticky keys on keyboard input handler. No longer sticky! :-D

[virtualjaguar] / src / gui / mainwin.cpp

diff --git a/src/gui/mainwin.cpp b/src/gui/mainwin.cpp
index 28bb6b26cfda22bafe238a1b32353589a99a031a..d05599d35c2bdb3817f08d2743a51707c28023e3 100644 (file)
--- a/src/gui/mainwin.cpp
+++ b/src/gui/mainwin.cpp
@@ -567,12 +567,27 @@ void MainWin::HandleKeys(QKeyEvent * e, bool state)
        else if (e->key() == (int)vjs.p2KeyBindings[BUTTON_D])
                keyHeld[P2DOWN] = state;
 
+#if 0
        // Next, check for conflicts and bail out if there are any...
        if ((keyHeld[P1LEFT] && keyHeld[P1RIGHT])
                || (keyHeld[P1UP] && keyHeld[P1DOWN])
                || (keyHeld[P2LEFT] && keyHeld[P2RIGHT])
                || (keyHeld[P2UP] && keyHeld[P2DOWN]))
                return;
+#else
+       // Next, check for conflicts and kill 'em if there are any...
+       if (keyHeld[P1LEFT] && keyHeld[P1RIGHT])
+               keyHeld[P1LEFT] = keyHeld[P1RIGHT] = false;
+
+       if (keyHeld[P1UP] && keyHeld[P1DOWN])
+               keyHeld[P1UP] = keyHeld[P1DOWN] = false;
+
+       if (keyHeld[P2LEFT] && keyHeld[P2RIGHT])
+               keyHeld[P2LEFT] = keyHeld[P2RIGHT] = false;
+
+       if (keyHeld[P2UP] && keyHeld[P2DOWN])
+               keyHeld[P2UP] = keyHeld[P2DOWN] = false;
+#endif
 #endif
 #endif
 
@@ -1124,7 +1139,7 @@ void MainWin::ReadSettings(void)
        vjs.frameSkip        = settings.value("frameSkip", 0).toInt();
        vjs.useJaguarBIOS    = settings.value("useJaguarBIOS", false).toBool();
        vjs.GPUEnabled       = settings.value("GPUEnabled", true).toBool();
-       vjs.DSPEnabled       = settings.value("DSPEnabled", false).toBool();
+       vjs.DSPEnabled       = settings.value("DSPEnabled", true).toBool();
        vjs.audioEnabled     = settings.value("audioEnabled", true).toBool();
        vjs.usePipelinedDSP  = settings.value("usePipelinedDSP", false).toBool();
        vjs.fullscreen       = settings.value("fullscreen", false).toBool();