3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #2005 from SijmenSchoon/fix-assertions

Browse source 
Fix tree-related assertions on startup on Linux
This commit is contained in:
Vojtech Kral 2019-03-27 11:29:32 +01:00 • committed by GitHub
commit 8dbbfc140b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/slic3r/GUI/Tab.cpp
View file

@ -542,7 +542,10 @@ void Tab::update_changed_tree_ui()
auto cur_item = m_treectrl->GetFirstVisibleItem(); auto cur_item = m_treectrl->GetFirstVisibleItem();
if (!cur_item || !m_treectrl->IsVisible(cur_item)) if (!cur_item || !m_treectrl->IsVisible(cur_item))
return; return;
auto selection = m_treectrl->GetItemText(m_treectrl->GetSelection());
auto selected_item = m_treectrl->GetSelection();
auto selection = selected_item ? m_treectrl->GetItemText(selected_item) : "";
while (cur_item) { while (cur_item) {
auto title = m_treectrl->GetItemText(cur_item); auto title = m_treectrl->GetItemText(cur_item);
for (auto page : m_pages) for (auto page : m_pages)
@ -2497,7 +2500,10 @@ void Tab::rebuild_page_tree()
if (!have_selection) { if (!have_selection) {
// this is triggered on first load, so we don't disable the sel change event // this is triggered on first load, so we don't disable the sel change event
m_treectrl->SelectItem(m_treectrl->GetFirstVisibleItem());//! (treectrl->GetFirstChild(rootItem)); auto item = m_treectrl->GetFirstVisibleItem();
if (item) {
m_treectrl->SelectItem(item);
}
} }
// Thaw(); // Thaw();
} }
@ -2524,7 +2530,10 @@ void Tab::update_page_tree_visibility()
if (!have_selection) { if (!have_selection) {
// this is triggered on first load, so we don't disable the sel change event // this is triggered on first load, so we don't disable the sel change event
m_treectrl->SelectItem(m_treectrl->GetFirstVisibleItem());//! (treectrl->GetFirstChild(rootItem)); auto item = m_treectrl->GetFirstVisibleItem();
if (item) {
m_treectrl->SelectItem(item);
}
} }
} }