fix(color): full screen widget may not exit cleanly after calling lcd…

….exitFullScreen() (#5544)
EdgeTX · Sep 19, 2024 · f4a6123 · f4a6123
1 parent 6b192e9
commit f4a6123
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/radio/src/gui/colorlcd/widget.h b/radio/src/gui/colorlcd/widget.h
@@ -92,6 +92,7 @@ class Widget : public Button
 
     // Set/unset fullscreen mode
     void setFullscreen(bool enable);
+    void closeFullscreen() { closeFS = true; }
 
     // Disable setting fullscreen mode
     void disableFullscreen();
@@ -115,6 +116,7 @@ class Widget : public Button
     uint32_t focusGainedTS = 0;
     bool fullscreen = false;
     bool fsAllowed = true;
+    bool closeFS = false;
 
     void onCancel() override;
     void onLongPress() override;

diff --git a/radio/src/lua/api_colorlcd.cpp b/radio/src/lua/api_colorlcd.cpp
@@ -1412,11 +1412,8 @@ Exit full screen widget mode.
 */
 static int luaLcdExitFullScreen(lua_State *L)
 {
-  if (runningFS) {
-    Widget* rfs = runningFS;
-    runningFS = nullptr;
-    rfs->setFullscreen(false);
-  }
+  if (runningFS)
+    runningFS->closeFullscreen();
   return 0;
 }
 

diff --git a/radio/src/lua/lua_widget.cpp b/radio/src/lua/lua_widget.cpp
@@ -236,6 +236,11 @@ void LuaWidget::checkEvents()
 {
   Widget::checkEvents();
 
+  if (closeFS) {
+    closeFS = false;
+    setFullscreen(false);
+  }
+
   // paint has not been called
   if (!refreshed) {
     background();