From b575e21ae12d869ba4c079113aa475cb1000228c Mon Sep 17 00:00:00 2001 From: Stone Li Date: Mon, 8 Aug 2022 14:33:49 +0800 Subject: [PATCH] FIX: fix crash when set empty project name on mac Change-Id: I656e6281f80bee9e06894a62f3ab6bb1316373ac Signed-off-by: Stone Li --- src/slic3r/GUI/Plater.cpp | 3 ++- src/slic3r/Utils/MacDarkMode.mm | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index 8e7c2fa90..06d49d9be 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -5591,7 +5591,8 @@ void Plater::priv::set_project_name(const wxString& project_name) wxGetApp().mainframe->topbar()->SetTitle(m_project_name); #else wxGetApp().mainframe->SetTitle(m_project_name); - wxGetApp().mainframe->update_title_colour_after_set_title(); + if (!m_project_name.IsEmpty()) + wxGetApp().mainframe->update_title_colour_after_set_title(); #endif } diff --git a/src/slic3r/Utils/MacDarkMode.mm b/src/slic3r/Utils/MacDarkMode.mm index bd02889b9..36889160f 100644 --- a/src/slic3r/Utils/MacDarkMode.mm +++ b/src/slic3r/Utils/MacDarkMode.mm @@ -17,7 +17,7 @@ namespace Slic3r { namespace GUI { -NSTextField* mainframe_text_field; +NSTextField* mainframe_text_field = nil; bool mac_dark_mode() {