piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Handles premature exit (no pun intended) (#4762)

Browse Source
This commit is contained in:
3djc
2017-04-08 10:32:59 +02:00
committed by Bertrand Songis
parent 116d24ec37
commit 76f3edb50d
3 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/128x64/model_setup.cpp
+7 -1
View File
@@ -911,8 +911,14 @@ void menuModelSetup(event_t event)
POPUP_MENU_START(onBindMenu);
continue;
}
if (moduleFlag[INTERNAL_MODULE] == MODULE_BIND)
if (moduleFlag[INTERNAL_MODULE] == MODULE_BIND) {
newFlag = MODULE_BIND;
}
else {
if (!popupMenuNoItems) {
s_editMode=0; // this is when popup is exited before a choice is made
}
}
}
else {
newFlag = MODULE_BIND;
radio/src/gui/212x64/model_setup.cpp
+7 -1
View File
@@ -925,8 +925,14 @@ void menuModelSetup(event_t event)
POPUP_MENU_START(onBindMenu);
continue;
}
if (moduleFlag[INTERNAL_MODULE] == MODULE_BIND)
if (moduleFlag[INTERNAL_MODULE] == MODULE_BIND) {
newFlag = MODULE_BIND;
}
else {
if (!popupMenuNoItems) {
s_editMode=0; // this is when popup is exited before a choice is made
}
}
}
else {
newFlag = MODULE_BIND;
radio/src/gui/480x272/model_setup.cpp
+7 -1
View File
@@ -835,8 +835,14 @@ bool menuModelSetup(event_t event)
POPUP_MENU_START(onBindMenu);
continue;
}
if (moduleFlag[INTERNAL_MODULE] == MODULE_BIND)
if (moduleFlag[INTERNAL_MODULE] == MODULE_BIND) {
newFlag = MODULE_BIND;
}
else {
if (!popupMenuNoItems) {
s_editMode=0; // this is when popup is exited before a choice is made
}
}
}
else {
newFlag = MODULE_BIND;