From c8c134d52d5d91530009b6b1480d5a2c08310382 Mon Sep 17 00:00:00 2001
From: Jesper Frickmann <jesper.frickmann@hotmail.com>
Date: Wed, 13 Apr 2022 20:05:42 -0400
Subject: [PATCH] fix: colorlcd - Resolve focus issue when launching lua when
 creating new model (#1825)

---
 radio/src/gui/colorlcd/model_select.cpp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/radio/src/gui/colorlcd/model_select.cpp b/radio/src/gui/colorlcd/model_select.cpp
index 43cb86f86..fc4de01f2 100644
--- a/radio/src/gui/colorlcd/model_select.cpp
+++ b/radio/src/gui/colorlcd/model_select.cpp
@@ -85,6 +85,7 @@ class TemplatePage : public Page
   char buffer[LEN_BUFFER + 1];
   char infoText[LEN_INFO_TEXT + 1] = { 0 };
   unsigned int count = 0;
+  static std::function<void(void)> update;
 
   void paint(BitmapBuffer *dc)
   {
@@ -104,6 +105,7 @@ class TemplatePage : public Page
 };
 
 char TemplatePage::path[LEN_PATH + 1];
+std::function<void(void)> TemplatePage::update = nullptr;
 
 class TemplateButton : public TextButton
 {  
@@ -170,6 +172,9 @@ class SelectTemplate : public TemplatePage
             snprintf(buffer, LEN_BUFFER, "%s%c%s%s", path, '/', name.c_str(), SCRIPT_EXT);
             if (f_stat(buffer, 0) == FR_OK) {
               luaExec(buffer);
+              // Need to update() the ModelCategoryPageBody before attaching StandaloneLuaWindow to not mess up focus
+              update();
+              update = nullptr;
               StandaloneLuaWindow::instance()->attach(focusWindow);
             }
 #endif
@@ -226,7 +231,7 @@ class SelectTemplateFolder : public TemplatePage
   public:
   SelectTemplateFolder(std::function<void(void)> update)
   {
-    this->update = update;
+    TemplatePage::update = update;
     rect_t rect = {PAGE_TITLE_LEFT, PAGE_TITLE_TOP + 10, LCD_W - PAGE_TITLE_LEFT, PAGE_LINE_HEIGHT};
     new StaticText(&header, rect, STR_SELECT_TEMPLATE_FOLDER, 0, COLOR_THEME_PRIMARY2);
 
@@ -307,11 +312,9 @@ class SelectTemplateFolder : public TemplatePage
 
   ~SelectTemplateFolder()
   {
-    update();
+    if (update)
+      update();
   }
-
-  protected:
-  std::function<void(void)> update;
 };
 
 class ModelButton : public Button