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

Remove static flag and extend case when call after will be from unactive Gizmo.

Browse Source
This commit is contained in:
Filip Sykala 2021-11-08 16:54:00 +01:00 committed by Lukas Matena
parent d72fba2a6a
commit 934ed0bbae
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp
View File

@ -15,16 +15,22 @@
namespace Slic3r::GUI { namespace Slic3r::GUI {
// Following flag and function allow to schedule a function call through CallAfter, // Extend call after only when Simplify gizmo is still alive
// but only run it when the gizmo is still alive. Scheduling a CallAfter from the static void call_after_if_active(std::function<void()> fn, GUI_App* app = &wxGetApp())
// background thread may trigger the code after the gizmo is destroyed. Having
// both the gizmo and the checking function static should solve it.
static bool s_simplify_gizmo_destructor_run = false;
void call_after_if_alive(std::function<void()> fn)
{ {
wxGetApp().CallAfter([fn]() { // check application GUI
if (! s_simplify_gizmo_destructor_run) if (app == nullptr) return;
fn(); app->CallAfter([fn, app]() {
// app must exist because it call this
// if (app == nullptr) return;
const Plater *plater = app->plater();
if (plater == nullptr) return;
const GLCanvas3D *canvas = plater->canvas3D();
if (canvas == nullptr) return;
const GLGizmosManager &mng = canvas->get_gizmos_manager();
// check if simplify is still activ gizmo
if (mng.get_current_type() != GLGizmosManager::Simplify) return;
fn();
}); });
} }
@ -63,8 +69,7 @@ GLGizmoSimplify::GLGizmoSimplify(GLCanvas3D & parent,
{} {}
GLGizmoSimplify::~GLGizmoSimplify() GLGizmoSimplify::~GLGizmoSimplify()
{ {
s_simplify_gizmo_destructor_run = true;
stop_worker_thread_request(); stop_worker_thread_request();
if (m_worker.joinable()) if (m_worker.joinable())
m_worker.join(); m_worker.join();
@ -420,7 +425,7 @@ void GLGizmoSimplify::process()
std::function<void(int)> statusfn = [this](int percent) { std::function<void(int)> statusfn = [this](int percent) {
std::lock_guard lk(m_state_mutex); std::lock_guard lk(m_state_mutex);
m_state.progress = percent; m_state.progress = percent;
call_after_if_alive([this]() { request_rerender(); }); call_after_if_active([this]() { request_rerender(); });
}; };
// Initialize. // Initialize.
@ -453,7 +458,7 @@ void GLGizmoSimplify::process()
} }
// Update UI. Use CallAfter so the function is run on UI thread. // Update UI. Use CallAfter so the function is run on UI thread.
call_after_if_alive([this]() { worker_finished(); }); call_after_if_active([this]() { worker_finished(); });
}, std::move(its)); }, std::move(its));
} }