Bugfix: Emulator power cycled on boot with no other keys pressed

shezik · Jul 16, 2023 · 105e71f · 105e71f
1 parent 6678fd9
commit 105e71f
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/src/main.cpp b/src/main.cpp
@@ -67,16 +67,17 @@ void setup() {
         nutEmuInterface.resume();
 
         uint16_t keycode;
-        xSemaphoreTake(keyboardMgr.getMutex(), 0);
+        xSemaphoreTake(keyboardMgr.getMutex(), portMAX_DELAY);
         for (;;) {
-            keycode = GetKeycodeContent(keyboardMgr.getPositiveKeycode());
-            if (keycode == 24 /*ON*/)
+            keycode = keyboardMgr.getPositiveKeycode();
+            if (GetKeycodeContent(keycode) == 24 /*ON*/)
                 continue;
             break;
         }
         xSemaphoreGive(keyboardMgr.getMutex());
+        printf_log("Keycode on startup: %d\n", keycode);
         if (keycode != INVALID_KEYCODE) {
-            nutEmuInterface.handleONKeySequence(keycode);
+            nutEmuInterface.handleONKeySequence(GetKeycodeContent(keycode));
         }
     }
     menu.init(!isRestoreFlagPresent);  // Load user settings into classes, skip showing main menu if restore file is successfully loaded