fix(bw): Long ENTER not working correctly when using ADJUST GV SF (#4709)

philmoz · pfeerick · commit f0a50bd98f36 · 2024-03-10T08:44:28.000Z
diff --git a/radio/src/gui/128x64/model_special_functions.cpp b/radio/src/gui/128x64/model_special_functions.cpp
@@ -395,6 +395,8 @@ void menuSpecialFunctions(event_t event, CustomFunctionData * functions, CustomF
                 break;
             }
 
+#if !defined(NAVIGATION_X7)
+            // For X7 type navigation the ENTER long press is handled below
             if (attr && event==EVT_KEY_LONG(KEY_ENTER)) {
               killEvents(event);
               s_editMode = !s_editMode;
@@ -403,6 +405,7 @@ void menuSpecialFunctions(event_t event, CustomFunctionData * functions, CustomF
               CFN_GVAR_MODE(cfn) &= 0x03;
               val_displayed = 0;
             }
+#endif
           }
 #endif // GVARS
           else if (attr) {

Original file line number	Diff line number	Diff line change
`@@ -395,6 +395,8 @@ void menuSpecialFunctions(event_t event, CustomFunctionData * functions, CustomF`
`395`	`395`	`break;`
`396`	`396`	`}`
`397`	`397`
	`398`	`+#if !defined(NAVIGATION_X7)`
	`399`	`+ // For X7 type navigation the ENTER long press is handled below`
`398`	`400`	`if (attr && event==EVT_KEY_LONG(KEY_ENTER)) {`
`399`	`401`	`killEvents(event);`
`400`	`402`	`s_editMode = !s_editMode;`
`@@ -403,6 +405,7 @@ void menuSpecialFunctions(event_t event, CustomFunctionData * functions, CustomF`
`403`	`405`	`CFN_GVAR_MODE(cfn) &= 0x03;`
`404`	`406`	`val_displayed = 0;`
`405`	`407`	`}`
	`408`	`+#endif`
`406`	`409`	`}`
`407`	`410`	`#endif // GVARS`
`408`	`411`	`else if (attr) {`