amd/orcaslicer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Temporary fix for crash, if try to add second settings grope for instance

Browse source
This commit is contained in:
YuSanka 2019-05-03 14:29:28 +02:00
parent d971c821b7
commit 80d3cbac73
1 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/slic3r/GUI/GUI_ObjectList.cpp
View file

@ -937,6 +937,13 @@ void ObjectList::get_freq_settings_choice(const wxString& bundle_name)
{ {
const std::vector<std::string>& options = get_options_for_bundle(bundle_name); const std::vector<std::string>& options = get_options_for_bundle(bundle_name);
/* #ys_FIXME_delete_after_testing ! Temporary workaround to avoid a crash:
* After a right click on an instance all items in the ObjectList are unselected,
* and as a result m_config == nullptr.
*/
if (!m_config)
return;
auto opt_keys = m_config->keys(); auto opt_keys = m_config->keys();
const DynamicPrintConfig& from_config = wxGetApp().preset_bundle->prints.get_edited_preset().config; const DynamicPrintConfig& from_config = wxGetApp().preset_bundle->prints.get_edited_preset().config;
@ -966,6 +973,10 @@ void ObjectList::update_settings_item()
const auto settings_item = m_objects_model->IsSettingsItem(item) ? item : m_objects_model->GetSettingsItem(item); const auto settings_item = m_objects_model->IsSettingsItem(item) ? item : m_objects_model->GetSettingsItem(item);
select_item(settings_item ? settings_item : select_item(settings_item ? settings_item :
m_objects_model->AddSettingsChild(item)); m_objects_model->AddSettingsChild(item));
// update object selection on Plater
if (!m_prevent_canvas_selection_update)
update_selections_on_canvas();
} }
else { else {
auto panel = wxGetApp().sidebar().scrolled_panel(); auto panel = wxGetApp().sidebar().scrolled_panel();