From 3383650c00e751e63dee52814e8bf47cd1e9c2e4 Mon Sep 17 00:00:00 2001 From: enricoturri1966 Date: Wed, 17 Jun 2020 09:34:33 +0200 Subject: [PATCH] ENABLE_LAYOUT_NO_RESTART -> Fixed MainFrame::update_layout() for Linux build --- src/slic3r/GUI/MainFrame.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/slic3r/GUI/MainFrame.cpp b/src/slic3r/GUI/MainFrame.cpp index 23287eb69..5f7f5a81f 100644 --- a/src/slic3r/GUI/MainFrame.cpp +++ b/src/slic3r/GUI/MainFrame.cpp @@ -242,16 +242,17 @@ void MainFrame::update_layout() } }; + // On Linux m_plater needs to be removed from m_tabpanel before to reparent it + int plater_page_id = m_tabpanel->FindPage(m_plater); + if (plater_page_id != wxNOT_FOUND) + m_tabpanel->RemovePage(plater_page_id); + if (m_plater->GetParent() != this) m_plater->Reparent(this); if (m_tabpanel->GetParent() != this) m_tabpanel->Reparent(this); - int plater_page_id = m_tabpanel->FindPage(m_plater); - if (plater_page_id != wxNOT_FOUND) - m_tabpanel->RemovePage(plater_page_id); - plater_page_id = (m_plater_page != nullptr) ? m_tabpanel->FindPage(m_plater_page) : wxNOT_FOUND; if (plater_page_id != wxNOT_FOUND) { m_tabpanel->DeletePage(plater_page_id);