[Exit] in a popup menu now calls onPopupHandler(nullptr)

This commit is contained in:
Bertrand Songis
2019-03-08 15:30:47 +01:00
parent f47b1065eb
commit 096fac2f27
21 changed files with 88 additions and 77 deletions
@@ -29,7 +29,7 @@ void onModelCustomScriptMenu(const char *result)
POPUP_WARNING(STR_NO_SCRIPTS_ON_SD);
}
}
else {
else if (result) {
// The user choosed a lua file in the list
copySelection(sd.file, result, sizeof(sd.file));
memset(sd.inputs, 0, sizeof(sd.inputs));
+1 -1
View File
@@ -148,7 +148,7 @@ void onModelSetupBitmapMenu(const char * result)
POPUP_WARNING(STR_NO_BITMAPS_ON_SD);
}
}
else {
else if (result) {
// The user choosed a bmp file in the list
copySelection(g_model.header.bitmap, result, sizeof(g_model.header.bitmap));
storageDirty(EE_MODEL);
@@ -56,7 +56,7 @@ void onCustomFunctionsFileSelectionMenu(const char * result)
POPUP_WARNING(func==FUNC_PLAY_SCRIPT ? STR_NO_SCRIPTS_ON_SD : STR_NO_SOUNDS_ON_SD);
}
}
else {
else if (result) {
// The user choosed a file in the list
memcpy(cf->play.name, result, sizeof(cf->play.name));
storageDirty(eeFlags);
@@ -128,7 +128,7 @@ void onAdjustGvarSourceLongEnterPress(const char * result)
CFN_PARAM(cfn) = 0;
storageDirty(EE_MODEL);
}
else {
else if (result) {
onSourceLongEnterPress(result);
}
}
+1 -1
View File
@@ -53,7 +53,7 @@ void onZoneOptionFileSelectionMenu(const char * result)
POPUP_WARNING(STR_NO_BITMAPS_ON_SD);
}
}
else {
else if (result) {
fileSelectionDone = true;
memcpy(fileSelection, result, sizeof(fileSelection));
}