diff --git a/radio/src/gui/common/stdlcd/model_inputs.cpp b/radio/src/gui/common/stdlcd/model_inputs.cpp index e95443493..af1621cb8 100644 --- a/radio/src/gui/common/stdlcd/model_inputs.cpp +++ b/radio/src/gui/common/stdlcd/model_inputs.cpp @@ -288,7 +288,7 @@ void menuModelExposAll(event_t event) } break; case EVT_KEY_BREAK(KEY_ENTER): - if ((!s_currCh || (s_copyMode && !s_copyTgtOfs))) { + if (sub >= 0 && (!s_currCh || (s_copyMode && !s_copyTgtOfs))) { s_copyMode = (s_copyMode == COPY_MODE ? MOVE_MODE : COPY_MODE); s_copySrcIdx = s_currIdx; s_copySrcCh = chn; @@ -310,7 +310,7 @@ void menuModelExposAll(event_t event) pushMenu(menuModelExpoOne); s_copyMode = 0; } - else { + else if (sub >= 0) { event = 0; s_copyMode = 0; POPUP_MENU_START(onExposMenu, 6, STR_EDIT, STR_INSERT_BEFORE, STR_INSERT_AFTER, STR_COPY, STR_MOVE, STR_DELETE); diff --git a/radio/src/gui/common/stdlcd/model_mixes.cpp b/radio/src/gui/common/stdlcd/model_mixes.cpp index 97ac38b74..d07a90f77 100644 --- a/radio/src/gui/common/stdlcd/model_mixes.cpp +++ b/radio/src/gui/common/stdlcd/model_mixes.cpp @@ -204,7 +204,7 @@ void menuModelMixAll(event_t event) } break; case EVT_KEY_BREAK(KEY_ENTER): - if ((!s_currCh || (s_copyMode && !s_copyTgtOfs))) { + if (sub >= 0 && (!s_currCh || (s_copyMode && !s_copyTgtOfs))) { s_copyMode = (s_copyMode == COPY_MODE ? MOVE_MODE : COPY_MODE); s_copySrcIdx = s_currIdx; s_copySrcCh = chn; @@ -227,7 +227,7 @@ void menuModelMixAll(event_t event) pushMenu(menuModelMixOne); s_copyMode = 0; } - else { + else if (sub >= 0) { event = 0; s_copyMode = 0; POPUP_MENU_START(onMixesMenu, 6, STR_EDIT, STR_INSERT_BEFORE, STR_INSERT_AFTER, STR_COPY, STR_MOVE, STR_DELETE);