fix gui old layout

supermerill · Apr 11, 2021 · 6f99e22 · 6f99e22
1 parent 0a65e1b
commit 6f99e22
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/slic3r/GUI/BackgroundSlicingProcess.cpp b/src/slic3r/GUI/BackgroundSlicingProcess.cpp
@@ -495,8 +495,15 @@ void BackgroundSlicingProcess::schedule_upload(Slic3r::PrintHostJob upload_job)
 
 void BackgroundSlicingProcess::reset_export()
 {
-	assert(! this->running());
-	if (! this->running()) {
+	bool running = true;
+	{
+		// I don't know if it's safe to let m_mutex be lock whiole doing invalidate_step.
+		// if so, please remove the braces.
+		std::unique_lock<std::mutex> lck(m_mutex);
+		running = this->running();
+		assert(!running);
+	}
+	if (!running) {
 		m_export_path.clear();
 		m_export_path_on_removable_media = false;
 		// invalidate_step expects the mutex to be locked.

diff --git a/src/slic3r/GUI/MainFrame.cpp b/src/slic3r/GUI/MainFrame.cpp
@@ -364,8 +364,6 @@ void MainFrame::update_layout()
         break;
     }case ESettingsLayout::Old:
     {
-        // don't use view_toolbar here
-        m_plater->enable_view_toolbar(false);
         //layout
         m_plater->Reparent(m_tabpanel);
         m_tabpanel->InsertPage(0, m_plater, _L("Plater"));