diff options
author | YuSanka <yusanka@gmail.com> | 2019-11-03 21:34:34 +0300 |
---|---|---|
committer | YuSanka <yusanka@gmail.com> | 2019-11-03 21:34:34 +0300 |
commit | c564f693e906d1764fffadba7bf7a29aecfb6742 (patch) | |
tree | 762edc1a458bd72090cd83b624234e19bce5e3be /src/slic3r/GUI/GUI_ObjectManipulation.cpp | |
parent | 674c6ce1c53f4b0cf9b3340de5f5e75087a8f5a1 (diff) | |
parent | bb8d59391fdd21317a68e4b83c54fc3f3fe88c0a (diff) |
Merge remote-tracking branch 'origin/master' into ys_color_print_extension
Diffstat (limited to 'src/slic3r/GUI/GUI_ObjectManipulation.cpp')
-rw-r--r-- | src/slic3r/GUI/GUI_ObjectManipulation.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/slic3r/GUI/GUI_ObjectManipulation.cpp b/src/slic3r/GUI/GUI_ObjectManipulation.cpp index d1cb1348c..5e939cb71 100644 --- a/src/slic3r/GUI/GUI_ObjectManipulation.cpp +++ b/src/slic3r/GUI/GUI_ObjectManipulation.cpp @@ -634,7 +634,11 @@ void ObjectManipulation::update_reset_buttons_visibility() show_drop_to_bed = (std::abs(min_z) > EPSILON); } - wxGetApp().CallAfter([this, show_rotation, show_scale, show_drop_to_bed]{ + wxGetApp().CallAfter([this, show_rotation, show_scale, show_drop_to_bed] { + // There is a case (under OSX), when this function is called after the Manipulation panel is hidden + // So, let check if Manipulation panel is still shown for this moment + if (!this->IsShown()) + return; m_reset_rotation_button->Show(show_rotation); m_reset_scale_button->Show(show_scale); m_drop_to_bed_button->Show(show_drop_to_bed); |