summaryrefslogtreecommitdiff
path: root/cad/PrusaSlicer/files/patch-src_slic3r_GUI_BackgroundSlicingProcess.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cad/PrusaSlicer/files/patch-src_slic3r_GUI_BackgroundSlicingProcess.cpp')
-rw-r--r--cad/PrusaSlicer/files/patch-src_slic3r_GUI_BackgroundSlicingProcess.cpp29
1 files changed, 29 insertions, 0 deletions
diff --git a/cad/PrusaSlicer/files/patch-src_slic3r_GUI_BackgroundSlicingProcess.cpp b/cad/PrusaSlicer/files/patch-src_slic3r_GUI_BackgroundSlicingProcess.cpp
new file mode 100644
index 000000000000..f56446391229
--- /dev/null
+++ b/cad/PrusaSlicer/files/patch-src_slic3r_GUI_BackgroundSlicingProcess.cpp
@@ -0,0 +1,29 @@
+--- src/slic3r/GUI/BackgroundSlicingProcess.cpp.orig 2021-07-16 10:14:03 UTC
++++ src/slic3r/GUI/BackgroundSlicingProcess.cpp
+@@ -465,7 +465,7 @@ void BackgroundSlicingProcess::schedule_export(const s
+ return;
+
+ // Guard against entering the export step before changing the export path.
+- tbb::mutex::scoped_lock lock(m_print->state_mutex());
++ std::scoped_lock<std::mutex> lock(m_print->state_mutex());
+ this->invalidate_step(bspsGCodeFinalize);
+ m_export_path = path;
+ m_export_path_on_removable_media = export_path_on_removable_media;
+@@ -478,7 +478,7 @@ void BackgroundSlicingProcess::schedule_upload(Slic3r:
+ return;
+
+ // Guard against entering the export step before changing the export path.
+- tbb::mutex::scoped_lock lock(m_print->state_mutex());
++ std::scoped_lock<std::mutex> lock(m_print->state_mutex());
+ this->invalidate_step(bspsGCodeFinalize);
+ m_export_path.clear();
+ m_upload_job = std::move(upload_job);
+@@ -491,7 +491,7 @@ void BackgroundSlicingProcess::reset_export()
+ m_export_path.clear();
+ m_export_path_on_removable_media = false;
+ // invalidate_step expects the mutex to be locked.
+- tbb::mutex::scoped_lock lock(m_print->state_mutex());
++ std::scoped_lock<std::mutex> lock(m_print->state_mutex());
+ this->invalidate_step(bspsGCodeFinalize);
+ }
+ }