From d9c1af208096e893cd069d50c8f7d18fe8272988 Mon Sep 17 00:00:00 2001
From: Raphael Coeffic <raphael.coeffic@frafos.com>
Date: Sat, 21 May 2022 12:16:19 +0200
Subject: [PATCH] standalone LUA: do not really "attach" the window to any
 parent

It is on a separate screen anyway.
---
 radio/src/gui/colorlcd/model_select.cpp   | 2 +-
 radio/src/gui/colorlcd/radio_tools.cpp    | 2 +-
 radio/src/gui/colorlcd/standalone_lua.cpp | 4 +---
 radio/src/gui/colorlcd/standalone_lua.h   | 2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/radio/src/gui/colorlcd/model_select.cpp b/radio/src/gui/colorlcd/model_select.cpp
index ddfaba053..c224e7b9f 100644
--- a/radio/src/gui/colorlcd/model_select.cpp
+++ b/radio/src/gui/colorlcd/model_select.cpp
@@ -175,7 +175,7 @@ class SelectTemplate : public TemplatePage
               // Need to update() the ModelCategoryPageBody before attaching StandaloneLuaWindow to not mess up focus
               update();
               update = nullptr;
-              StandaloneLuaWindow::instance()->attach(focusWindow);
+              StandaloneLuaWindow::instance()->attach();
             }
 #endif
             return 0;
diff --git a/radio/src/gui/colorlcd/radio_tools.cpp b/radio/src/gui/colorlcd/radio_tools.cpp
index 8b9851c77..e0be83253 100644
--- a/radio/src/gui/colorlcd/radio_tools.cpp
+++ b/radio/src/gui/colorlcd/radio_tools.cpp
@@ -96,7 +96,7 @@ static void run_lua_tool(Window* parent, const std::string& path)
 
   luaExec(path.c_str());
   auto lua_win = StandaloneLuaWindow::instance();
-  lua_win->attach(parent);
+  lua_win->attach();
 }
 
 // LUA scripts in TOOLS
diff --git a/radio/src/gui/colorlcd/standalone_lua.cpp b/radio/src/gui/colorlcd/standalone_lua.cpp
index 60b5663d4..c4c2705fe 100644
--- a/radio/src/gui/colorlcd/standalone_lua.cpp
+++ b/radio/src/gui/colorlcd/standalone_lua.cpp
@@ -71,15 +71,13 @@ StandaloneLuaWindow* StandaloneLuaWindow::instance()
   return _instance;
 }
 
-void StandaloneLuaWindow::attach(Window* newParent)
+void StandaloneLuaWindow::attach()
 {
   if (!prevScreen) {
 
     // backup previous screen
     prevScreen = lv_scr_act();
 
-    Window::attach(newParent->getFullScreenWindow());
-
     // and load new one
     lv_scr_load(lvobj);
 
diff --git a/radio/src/gui/colorlcd/standalone_lua.h b/radio/src/gui/colorlcd/standalone_lua.h
index 56e5dde20..1a1e97b96 100644
--- a/radio/src/gui/colorlcd/standalone_lua.h
+++ b/radio/src/gui/colorlcd/standalone_lua.h
@@ -41,7 +41,7 @@ class StandaloneLuaWindow : public Window
 public:
   static StandaloneLuaWindow* instance();
 
-  void attach(Window* newParent);
+  void attach();
   void deleteLater(bool detach = true, bool trash = true) override;
   void paint(BitmapBuffer* dc) override;
   void checkEvents() override;