From 4cddd3ea857daca2d11f7d74a42b20e6bdc503f8 Mon Sep 17 00:00:00 2001
From: YuSanka <yusanka@gmail.com>
Date: Thu, 6 Jun 2024 15:13:58 +0200
Subject: [PATCH] GCodeViewer: Fixed crash on start and switch of color mode
 (SPE-2340)

---
 src/slic3r/GUI/GUI_App.cpp   | 3 +++
 src/slic3r/GUI/MainFrame.cpp | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp
index 64afe001d1..53d8e1e933 100644
--- a/src/slic3r/GUI/GUI_App.cpp
+++ b/src/slic3r/GUI/GUI_App.cpp
@@ -2479,6 +2479,9 @@ bool GUI_App::save_mode(const /*ConfigOptionMode*/int mode)
 // Update view mode according to selected menu
 void GUI_App::update_mode()
 {
+    if (is_gcode_viewer())
+        return;
+
     sidebar().update_mode();
 
     mainframe->m_tmp_top_bar->UpdateMode();
diff --git a/src/slic3r/GUI/MainFrame.cpp b/src/slic3r/GUI/MainFrame.cpp
index 54dc1d148d..127a402d94 100644
--- a/src/slic3r/GUI/MainFrame.cpp
+++ b/src/slic3r/GUI/MainFrame.cpp
@@ -1092,6 +1092,12 @@ void MainFrame::on_sys_color_changed()
 
     // update label colors in respect to the system mode
     wxGetApp().init_ui_colours();
+
+    if (wxGetApp().is_gcode_viewer()) {
+        MenuFactory::sys_color_changed(m_menubar);
+        return;
+    }
+
     // but if there are some ui colors in appconfig, they have to be applied
     wxGetApp().update_ui_colours_from_appconfig();
 #ifdef __WXMSW__