win32_guikey handling update.

diff --git a/inputdevice.cpp b/inputdevice.cpp
index 9bfec3fedfe5f4146411837fcf7834b2ae009456..399af4c8b5c6e85fe7d0b5c97aa795fd111fe57b 100644 (file)
--- a/inputdevice.cpp
+++ b/inputdevice.cpp
@@ -4688,8 +4688,10 @@ static int handle_input_event2(int nr, int state, int max, int flags, int extra)
 
 #ifdef _WIN32
        // ignore normal GUI event if forced gui key is in use
-       if (currprefs.win32_guikey >= 0 && nr == INPUTEVENT_SPC_ENTERGUI)
-               return 0;
+       if (nr == INPUTEVENT_SPC_ENTERGUI) {
+               if (currprefs.win32_guikey > 0)
+                       return 0;
+       }
 #endif
 
        ie = &events[nr];

diff --git a/od-win32/keyboard_win32.cpp b/od-win32/keyboard_win32.cpp
index bbb3c39b1eff3974ee6015b5c85bf5384d969bf7..627bd4a6db7c2ca7a36743aac0d1b7b03e5c36a2 100644 (file)
--- a/od-win32/keyboard_win32.cpp
+++ b/od-win32/keyboard_win32.cpp
@@ -453,7 +453,7 @@ bool my_kbd_handler (int keyboard, int scancode, int newstate, bool alwaysreleas
                if (currprefs.win32_guikey >= 0x100) {
                        if (scancode_new == DIK_F12)
                                return true;
-               } else if (currprefs.win32_guikey >= 0) {
+               } else if (currprefs.win32_guikey > 0) {
                        if (scancode_new == defaultguikey && currprefs.win32_guikey != scancode_new) {
                                scancode = 0;
                                if (specialpressed () && ctrlpressed() && shiftpressed() && altpressed ())
@@ -462,7 +462,7 @@ bool my_kbd_handler (int keyboard, int scancode, int newstate, bool alwaysreleas
                                inputdevice_add_inputcode (AKS_ENTERGUI, 1, NULL);
                                scancode = 0;
                        }
-               } else if (!specialpressed () && !ctrlpressed() && !shiftpressed() && !altpressed () && scancode_new == defaultguikey) {
+               } else if (currprefs.win32_guikey != 0 && !specialpressed () && !ctrlpressed() && !shiftpressed() && !altpressed () && scancode_new == defaultguikey) {
                        inputdevice_add_inputcode (AKS_ENTERGUI, 1, NULL);
                        scancode = 0;
                }