From 56c3ba182eeb9bef6d03f9caab9fc2c9e1660c44 Mon Sep 17 00:00:00 2001 From: Phil Mitchell Date: Thu, 22 Dec 2022 11:26:48 +1100 Subject: [PATCH 1/2] Fix display of model notes when selecting model. Fixes issues 2722 and 2921. --- radio/src/gui/colorlcd/model_select.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/radio/src/gui/colorlcd/model_select.cpp b/radio/src/gui/colorlcd/model_select.cpp index 11bfa7ee239..91852b2470f 100644 --- a/radio/src/gui/colorlcd/model_select.cpp +++ b/radio/src/gui/colorlcd/model_select.cpp @@ -371,6 +371,10 @@ ModelsPageBody::ModelsPageBody(Window *parent, const rect_t &rect) : void ModelsPageBody::selectModel(ModelCell *model) { + // Exit to main view + auto w = Layer::back(); + if (w) w->onCancel(); + bool modelConnected = TELEMETRY_STREAMING() && !g_eeGeneral.disableRssiPoweroffAlarm; if (modelConnected) { @@ -397,10 +401,6 @@ void ModelsPageBody::selectModel(ModelCell *model) storageDirty(EE_GENERAL); storageCheck(true); - - // Exit to main view - auto w = Layer::back(); - if (w) w->onCancel(); } void ModelsPageBody::duplicateModel(ModelCell* model) From 5a03832a258948f70f7896cadd0981ce39282f94 Mon Sep 17 00:00:00 2001 From: Phil Mitchell Date: Thu, 22 Dec 2022 13:21:16 +1100 Subject: [PATCH 2/2] Move view close code as suggested by @pfeerick. --- radio/src/gui/colorlcd/model_select.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/radio/src/gui/colorlcd/model_select.cpp b/radio/src/gui/colorlcd/model_select.cpp index 91852b2470f..59013cca3b9 100644 --- a/radio/src/gui/colorlcd/model_select.cpp +++ b/radio/src/gui/colorlcd/model_select.cpp @@ -371,10 +371,6 @@ ModelsPageBody::ModelsPageBody(Window *parent, const rect_t &rect) : void ModelsPageBody::selectModel(ModelCell *model) { - // Exit to main view - auto w = Layer::back(); - if (w) w->onCancel(); - bool modelConnected = TELEMETRY_STREAMING() && !g_eeGeneral.disableRssiPoweroffAlarm; if (modelConnected) { @@ -390,6 +386,10 @@ void ModelsPageBody::selectModel(ModelCell *model) } } + // Exit to main view + auto w = Layer::back(); + if (w) w->onCancel(); + // store changes (if any) and load selected model storageFlushCurrentModel(); storageCheck(true);