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

Fixed a fishy null pointer reference bug reported by ASAN time to time.

Browse source
This commit is contained in:
bubnikv 2020-03-11 13:58:31 +01:00
parent 2c9bd86a70
commit ed760ae932
1 changed files with 23 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -850,30 +850,32 @@ void ObjectList::list_manipulation(const wxPoint& mouse_pos, bool evt_context_me
Select(item); Select(item);
} }
const wxString title = col->GetTitle(); if (col != nullptr)
if (title == " ")
toggle_printable_state(item);
else if (title == _("Editing"))
show_context_menu(evt_context_menu);
else if (title == _("Name"))
{ {
if (wxOSX) const wxString title = col->GetTitle();
show_context_menu(evt_context_menu); // return context menu under OSX (related to #2909) if (title == " ")
toggle_printable_state(item);
else if (title == _("Editing"))
show_context_menu(evt_context_menu);
else if (title == _("Name"))
{
if (wxOSX)
show_context_menu(evt_context_menu); // return context menu under OSX (related to #2909)
if (is_windows10()) if (is_windows10())
{ {
int obj_idx, vol_idx; int obj_idx, vol_idx;
get_selected_item_indexes(obj_idx, vol_idx, item); get_selected_item_indexes(obj_idx, vol_idx, item);
if (get_mesh_errors_count(obj_idx, vol_idx) > 0 && if (get_mesh_errors_count(obj_idx, vol_idx) > 0 &&
mouse_pos.x > 2 * wxGetApp().em_unit() && mouse_pos.x < 4 * wxGetApp().em_unit()) mouse_pos.x > 2 * wxGetApp().em_unit() && mouse_pos.x < 4 * wxGetApp().em_unit())
fix_through_netfabb(); fix_through_netfabb();
} }
} }
// workaround for extruder editing under OSX // workaround for extruder editing under OSX
else if (wxOSX && evt_context_menu && title == _("Extruder")) else if (wxOSX && evt_context_menu && title == _("Extruder"))
extruder_editing(); extruder_editing();
}
#ifndef __WXMSW__ #ifndef __WXMSW__
GetMainWindow()->SetToolTip(""); // hide tooltip GetMainWindow()->SetToolTip(""); // hide tooltip