summaryrefslogtreecommitdiff
path: root/cad/PrusaSlicer/files/patch-src_slic3r_GUI_BackgroundSlicingProcess.cpp
diff options
context:
space:
mode:
authorSteve Wills <swills@FreeBSD.org>2021-09-15 12:30:06 +0300
committerMichael Zhilin <mizhka@FreeBSD.org>2021-09-15 12:32:10 +0300
commit8a4af427075f66baf4fedbbaba03ffc7f3f1f536 (patch)
tree886f4cfa57d18553b607758842186da88a1a9228 /cad/PrusaSlicer/files/patch-src_slic3r_GUI_BackgroundSlicingProcess.cpp
parentwww/deno: Update to 1.14.0 (diff)
cad/PrusaSlicer: Update to 2.3.3
- Update to 2.3.3 - Change the dependency from devel/tbb to devel/onetbb ChangeLog: https://github.com/prusa3d/PrusaSlicer/releases/tag/version_2.3.3 PR: 258483 Submitted by: Steve Wills <swills@FreeBSD.org> Reported by: teodorsigaev@gmail.com (tested), eborisch+FreeBSD@gmail.com (tested)
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);
+ }
+ }