From 76ffd4fcb4e4c4f2e09b797ef67a584d456a0b44 Mon Sep 17 00:00:00 2001 From: 3djc Date: Wed, 28 Jun 2017 13:22:37 +0200 Subject: [PATCH] Do not display popup menu on last line (cpy trim -> sub for all chan) (#5061) --- radio/src/gui/128x64/model_outputs_arm.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/radio/src/gui/128x64/model_outputs_arm.cpp b/radio/src/gui/128x64/model_outputs_arm.cpp index 2547a150e..a9ae789e4 100644 --- a/radio/src/gui/128x64/model_outputs_arm.cpp +++ b/radio/src/gui/128x64/model_outputs_arm.cpp @@ -183,7 +183,6 @@ void menuModelLimitsOne(event_t event) void onLimitsMenu(const char *result) { s_currIdx = menuVerticalPosition - HEADER_LINE; - if (result == STR_RESET) { LimitData *ld = limitAddress(s_currIdx); ld->min = 0; @@ -221,7 +220,7 @@ void menuModelLimits(event_t event) uint8_t k = i+menuVerticalOffset; LcdFlags attr = (sub==MAX_OUTPUT_CHANNELS) ? INVERS : 0; - if (sub==k && event==EVT_KEY_FIRST(KEY_ENTER) && !READ_ONLY()) { + if (sub==k && event==EVT_KEY_FIRST(KEY_ENTER) && !READ_ONLY() && (k != MAX_OUTPUT_CHANNELS) ) { killEvents(event); POPUP_MENU_ADD_ITEM(STR_EDIT); POPUP_MENU_ADD_ITEM(STR_RESET);