Keyboard lock is possible even if Rescue Ops is enabled

app/generic.c

@@ -39,6 +39,22 @@
 
 void GENERIC_Key_F(bool bKeyPressed, bool bKeyHeld)
 {
+    #ifdef ENABLE_F4HWN_FEAT_MENU_LOCK
+        if(gEeprom.MENU_LOCK == true)
+        {
+            if (bKeyHeld || !bKeyPressed) { // held or released
+                if (bKeyHeld || bKeyPressed) { // held or pressed (cannot be held and not pressed I guess, so it checks only if HELD?)
+                    if (!bKeyHeld) // won't ever pass
+                        return;
+
+                    if (!bKeyPressed) // won't ever pass
+                        return;
+
+                    COMMON_KeypadLockToggle();
+                }
+            }
+        }
+    #else
         if (gInputBoxIndex > 0) {
             if (!bKeyHeld && bKeyPressed) // short pressed
                 gBeepToPlay = BEEP_500HZ_60MS_DOUBLE_BEEP_OPTIONAL;
@@ -94,6 +110,7 @@ void GENERIC_Key_F(bool bKeyPressed, bool bKeyHeld)
             gBeepToPlay     = BEEP_440HZ_500MS;
             gPttWasReleased = true;
         }
+    #endif
 }
 
 void GENERIC_Key_PTT(bool bKeyPressed)

app/main.c

@@ -948,13 +948,7 @@ void MAIN_ProcessKeys(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
             MAIN_Key_STAR(bKeyPressed, bKeyHeld);
             break;
         case KEY_F:
-            #ifndef ENABLE_FEAT_F4HWN_MENU_LOCK
             GENERIC_Key_F(bKeyPressed, bKeyHeld);
-            #else
-                if(gEeprom.MENU_LOCK == false) {
-                    GENERIC_Key_F(bKeyPressed, bKeyHeld);
-                }
-            #endif
             break;
         case KEY_PTT:
             GENERIC_Key_PTT(bKeyPressed);

ui/status.c

@@ -213,15 +213,13 @@ void UI_DisplayStatus()
         memcpy(line + x + 1, gFontKeyLock, sizeof(gFontKeyLock));
     }
     else if (gWasFKeyPressed) {
+        #ifdef ENABLE_FEAT_F4HWN_MENU_LOCK
+            if(gEeprom.MENU_LOCK == false) {
                 memcpy(line + x + 1, gFontF, sizeof(gFontF));
-        /*
-        UI_PrintStringSmallBufferNormal("F", line + x + 1);
-        
-        for (uint8_t i = 71; i < 79; i++)
-        {
-            gStatusLine[i] ^= 0x7F;
             }
-        */
+        #else
+            memcpy(line + x + 1, gFontF, sizeof(gFontF));
+        #endif
     }
     else if (gBackLight)
     {