From b9ac8aeafa06ecb1588e1d72aa2e127379a5babc Mon Sep 17 00:00:00 2001 From: Filip Sykala - NTB T15p Date: Mon, 3 Apr 2023 14:07:16 +0200 Subject: [PATCH] Fix for crash --- src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp b/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp index ac74b43b5b..8b134e2e62 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp @@ -342,6 +342,13 @@ bool GLGizmoEmboss::init_create(ModelVolumeType volume_type) BOOST_LOG_TRIVIAL(error) << "Can't create text. Gizmo is not activabled."; return false; } + + // Check can't be inside is_activable() cause crash + // steps to reproduce: start App -> key 't' -> key 'delete' + if (wxGetApp().obj_list()->has_selected_cut_object()) { + BOOST_LOG_TRIVIAL(error) << "Can't create text on cut object"; + return false; + } m_style_manager.discard_style_changes(); @@ -552,8 +559,7 @@ bool GLGizmoEmboss::on_init() } bool GLGizmoEmboss::on_is_activable() const { - return wxGetApp().get_mode() != comSimple && - !wxGetApp().obj_list()->has_selected_cut_object(); + return wxGetApp().get_mode() != comSimple; } std::string GLGizmoEmboss::on_get_name() const { return _u8L("Emboss"); }