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

Prevent potential data races in arrange job

Browse Source
This commit is contained in:
tamasmeszaros 2022-09-13 15:07:40 +02:00
parent fa897fbda4
commit 4d9530deb7
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/slic3r/GUI/Jobs/ArrangeJob.cpp
View File

@ -167,12 +167,16 @@ void ArrangeJob::process(Ctl &ctl)
static const auto arrangestr = _u8L("Arranging"); static const auto arrangestr = _u8L("Arranging");
ctl.update_status(0, arrangestr); ctl.update_status(0, arrangestr);
ctl.call_on_main_thread([this]{ prepare(); }).wait();;
arrangement::ArrangeParams params = get_arrange_params(m_plater); arrangement::ArrangeParams params;
Points bedpts;
ctl.call_on_main_thread([this, &params, &bedpts]{
prepare();
params = get_arrange_params(m_plater);
bedpts = get_bed_shape(*m_plater->config());
}).wait();;
auto count = unsigned(m_selected.size() + m_unprintable.size()); auto count = unsigned(m_selected.size() + m_unprintable.size());
Points bedpts = get_bed_shape(*m_plater->config());
params.stopcondition = [&ctl]() { return ctl.was_canceled(); }; params.stopcondition = [&ctl]() { return ctl.was_canceled(); };