From 8eb55452a5569691429e1005cfba92764eeb4022 Mon Sep 17 00:00:00 2001 From: philmoz Date: Thu, 22 Dec 2022 20:01:29 +1100 Subject: [PATCH] fix(color): Display of model notes when selecting model (#2922) * Fix display of model notes when selecting model. Fixes issues 2722 and 2921. * 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 11bfa7ee2..59013cca3 100644 --- a/radio/src/gui/colorlcd/model_select.cpp +++ b/radio/src/gui/colorlcd/model_select.cpp @@ -386,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); @@ -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)