From 000668bf0b8c7c2f558ec0af79df25f2d1ac75a5 Mon Sep 17 00:00:00 2001
From: philmoz <philmoz@users.noreply.github.com>
Date: Thu, 20 Nov 2025 07:26:40 +1100
Subject: [PATCH] fix(color): full screen dialog may crash (#6806)

---
 radio/src/gui/colorlcd/libui/fullscreen_dialog.cpp | 9 ++-------
 radio/src/gui/colorlcd/libui/fullscreen_dialog.h   | 6 ++----
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/radio/src/gui/colorlcd/libui/fullscreen_dialog.cpp b/radio/src/gui/colorlcd/libui/fullscreen_dialog.cpp
index 928a92a49..b816cceec 100644
--- a/radio/src/gui/colorlcd/libui/fullscreen_dialog.cpp
+++ b/radio/src/gui/colorlcd/libui/fullscreen_dialog.cpp
@@ -49,11 +49,6 @@ FullScreenDialog::FullScreenDialog(
 
   bringToTop();
 
-  delayLoad();
-}
-
-void FullScreenDialog::delayedInit()
-{
   build();
 }
 
@@ -165,9 +160,9 @@ void FullScreenDialog::deleteLater(bool detach, bool trash)
   }
 }
 
-void FullScreenDialog::setMessage(std::string text)
+void FullScreenDialog::setMessage(const char* text)
 {
-  messageLabel->setText(text);
+  if (messageLabel) messageLabel->setText(text);
 }
 
 static void run_ui_manually()
diff --git a/radio/src/gui/colorlcd/libui/fullscreen_dialog.h b/radio/src/gui/colorlcd/libui/fullscreen_dialog.h
index ed7063c9a..77ad51e2b 100644
--- a/radio/src/gui/colorlcd/libui/fullscreen_dialog.h
+++ b/radio/src/gui/colorlcd/libui/fullscreen_dialog.h
@@ -39,7 +39,7 @@ class FullScreenDialog : public Window
   }
 #endif
 
-  void setMessage(std::string text);
+  void setMessage(const char* text);
 
   void onEvent(event_t event) override;
   void onCancel() override;
@@ -83,9 +83,7 @@ class FullScreenDialog : public Window
   bool running = false;
   std::function<bool(void)> closeCondition;
   std::function<void(void)> confirmHandler;
-  StaticText* messageLabel;
+  StaticText* messageLabel = nullptr;
 
   void build();
-
-  void delayedInit() override;
 };