From d2899a09a8b4655bda55278a4fb5794777f5f6e7 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Thu, 12 Sep 2019 15:18:18 +0200 Subject: [PATCH] Restore model menu fixed --- radio/src/gui/128x64/model_select.cpp | 6 +++--- radio/src/gui/212x64/model_select.cpp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/radio/src/gui/128x64/model_select.cpp b/radio/src/gui/128x64/model_select.cpp index 43c7ceb33..d0184e5ea 100644 --- a/radio/src/gui/128x64/model_select.cpp +++ b/radio/src/gui/128x64/model_select.cpp @@ -54,10 +54,10 @@ void onModelSelectMenu(const char * result) POPUP_WARNING(eeBackupModel(sub)); } else if (result == STR_RESTORE_MODEL || result == STR_UPDATE_LIST) { - if (!sdListFiles(MODELS_PATH, MODELS_EXT, MENU_LINE_LENGTH-1, NULL)) { + if (sdListFiles(MODELS_PATH, MODELS_EXT, MENU_LINE_LENGTH-1, nullptr)) + POPUP_MENU_START(onModelSelectMenu); + else POPUP_WARNING(STR_NO_MODELS_ON_SD); - } - POPUP_MENU_START(onModelSelectMenu); } #endif else if (result == STR_DELETE_MODEL) { diff --git a/radio/src/gui/212x64/model_select.cpp b/radio/src/gui/212x64/model_select.cpp index def9aae91..8b396e1b4 100644 --- a/radio/src/gui/212x64/model_select.cpp +++ b/radio/src/gui/212x64/model_select.cpp @@ -45,10 +45,10 @@ void onModelSelectMenu(const char * result) POPUP_WARNING(eeBackupModel(sub)); } else if (result == STR_RESTORE_MODEL || result == STR_UPDATE_LIST) { - if (!sdListFiles(MODELS_PATH, MODELS_EXT, MENU_LINE_LENGTH-1, NULL)) { + if (sdListFiles(MODELS_PATH, MODELS_EXT, MENU_LINE_LENGTH-1, nullptr)) + POPUP_MENU_START(onModelSelectMenu); + else POPUP_WARNING(STR_NO_MODELS_ON_SD); - } - POPUP_MENU_START(onModelSelectMenu); } else if (result == STR_DELETE_MODEL) { char * nametmp = reusableBuffer.modelsel.mainname;