From 1c919977b10d2094204aac6f32f8e874a2ba9c92 Mon Sep 17 00:00:00 2001 From: tao wang Date: Thu, 1 Dec 2022 20:35:01 +0800 Subject: [PATCH] FIX:fixed fixed crash when started on macos Change-Id: Ic09a1fb61f68dffabdaf61b4c9e88bac62094a52 --- src/slic3r/GUI/MainFrame.cpp | 10 ++++++++-- src/slic3r/GUI/MainFrame.hpp | 1 + 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/slic3r/GUI/MainFrame.cpp b/src/slic3r/GUI/MainFrame.cpp index d0ea1a4ea8..4a3ed1454a 100644 --- a/src/slic3r/GUI/MainFrame.cpp +++ b/src/slic3r/GUI/MainFrame.cpp @@ -476,8 +476,14 @@ DPIFrame(NULL, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, BORDERLESS_FRAME_ }); #endif - wxGetApp().persist_window_geometry(this, true); - wxGetApp().persist_window_geometry(&m_settings_dialog, true); + Bind(wxEVT_SHOW, [this](auto& e) { + if (!m_reset_position) { + wxGetApp().persist_window_geometry(this, true); + wxGetApp().persist_window_geometry(&m_settings_dialog, true); + m_reset_position = true; + } + }); + update_ui_from_settings(); // FIXME (?) diff --git a/src/slic3r/GUI/MainFrame.hpp b/src/slic3r/GUI/MainFrame.hpp index c30aff0941..3c6fda6f0a 100644 --- a/src/slic3r/GUI/MainFrame.hpp +++ b/src/slic3r/GUI/MainFrame.hpp @@ -83,6 +83,7 @@ protected: class MainFrame : public DPIFrame { + bool m_reset_position{false}; bool m_loaded {false}; wxTimer* m_reset_title_text_colour_timer{ nullptr };