3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-12 01:07:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fixed some background processing synchronization issues.

Browse source
This commit is contained in:
bubnikv 2018-11-23 17:05:44 +01:00
parent aaab549cfa
commit 103af1d8fb
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/libslic3r/Print.cpp
View file

@ -695,7 +695,8 @@ Print::ApplyStatus Print::apply(const Model &model, const DynamicPrintConfig &co
tbb::mutex::scoped_lock lock(this->state_mutex()); tbb::mutex::scoped_lock lock(this->state_mutex());
// The following call may stop the background processing. // The following call may stop the background processing.
update_apply_status(this->invalidate_state_by_config_options(print_diff)); if (! print_diff.empty())
update_apply_status(this->invalidate_state_by_config_options(print_diff));
// Apply variables to placeholder parser. The placeholder parser is used by G-code export, // Apply variables to placeholder parser. The placeholder parser is used by G-code export,
// which should be stopped if print_diff is not empty. // which should be stopped if print_diff is not empty.
if (m_placeholder_parser.apply_config(config)) if (m_placeholder_parser.apply_config(config))

6
src/libslic3r/SLAPrint.cpp
View file

@ -130,8 +130,10 @@ SLAPrint::ApplyStatus SLAPrint::apply(const Model &model,
tbb::mutex::scoped_lock lock(this->state_mutex()); tbb::mutex::scoped_lock lock(this->state_mutex());
// The following call may stop the background processing. // The following call may stop the background processing.
update_apply_status(this->invalidate_state_by_config_options(printer_diff)); if (! printer_diff.empty())
update_apply_status(this->invalidate_state_by_config_options(material_diff)); update_apply_status(this->invalidate_state_by_config_options(printer_diff));
if (! material_diff.empty())
update_apply_status(this->invalidate_state_by_config_options(material_diff));
// It is also safe to change m_config now after this->invalidate_state_by_config_options() call. // It is also safe to change m_config now after this->invalidate_state_by_config_options() call.
m_printer_config.apply_only(config, printer_diff, true); m_printer_config.apply_only(config, printer_diff, true);