From 3de67be9255595ca0a25270eb15e21e4386021e4 Mon Sep 17 00:00:00 2001
From: dlktdr <cblackburn320@gmail.com>
Date: Sun, 4 Sep 2022 12:47:12 -0700
Subject: [PATCH] (fw) Fix: Update the title on new model

---
 radio/src/gui/colorlcd/model_select.cpp | 26 +++++++++++++++----------
 radio/src/gui/colorlcd/model_select.h   |  1 +
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/radio/src/gui/colorlcd/model_select.cpp b/radio/src/gui/colorlcd/model_select.cpp
index 8bd11d91a..9d6b45b67 100644
--- a/radio/src/gui/colorlcd/model_select.cpp
+++ b/radio/src/gui/colorlcd/model_select.cpp
@@ -549,22 +549,14 @@ void ModelLabelsWindow::newModel()
     lblselector->setNames(labels);
     lblselector->setSelected(modelslabels.getLabels().size());
     mdlselector->update(0);
+    setTitle();
   });
 }
 
 void ModelLabelsWindow::buildHead(PageHeader *hdr)
 {
   // page title
-  auto curModel = modelslist.getCurrentModel();
-  auto modelName = curModel != nullptr ? curModel->modelName : STR_NONE;
-
-  std::string titleName = STR_SELECT_MODEL;
-  titleName += "\n";
-  titleName += STR_CURRENT_MODEL;
-  titleName += ": ";
-  titleName += modelName;
-
-  hdr->setTitle(titleName);
+  setTitle();
 
   // new model button
   auto btn = new TextButton(
@@ -786,6 +778,20 @@ void ModelLabelsWindow::labelRefreshRequest()
   lblselector->setNames(labels);
 }
 
+void ModelLabelsWindow::setTitle()
+{
+  auto curModel = modelslist.getCurrentModel();
+  auto modelName = curModel != nullptr ? curModel->modelName : STR_NONE;
+
+  std::string titleName = STR_SELECT_MODEL;
+  titleName += "\n";
+  titleName += STR_CURRENT_MODEL;
+  titleName += ": ";
+  titleName += modelName;
+
+  header.setTitle(titleName);
+}
+
 //-----------------------------------------------------------------------------
 
 ProgressDialog::ProgressDialog(Window *parent, std::string title,
diff --git a/radio/src/gui/colorlcd/model_select.h b/radio/src/gui/colorlcd/model_select.h
index 2b2413615..880d0248d 100644
--- a/radio/src/gui/colorlcd/model_select.h
+++ b/radio/src/gui/colorlcd/model_select.h
@@ -96,6 +96,7 @@ class ModelLabelsWindow : public Page
   void buildBody(FormWindow *window);
   void updateFilteredLabels(std::set<uint32_t> selected, bool setdirty = true);
   void labelRefreshRequest();
+  void setTitle();
 };
 
 class ProgressDialog : public Dialog