GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-09-17 01:43:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix gui old layout

Browse Source
This commit is contained in:
remi durand 2021-04-11 22:55:12 +02:00
parent 0a65e1b0d6
commit 6f99e220e5
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/slic3r/GUI/BackgroundSlicingProcess.cpp
View File

@ -495,8 +495,15 @@ void BackgroundSlicingProcess::schedule_upload(Slic3r::PrintHostJob upload_job)
void BackgroundSlicingProcess::reset_export() void BackgroundSlicingProcess::reset_export()
{ {
assert(! this->running()); bool running = true;
if (! this->running()) { {
// 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.clear();
m_export_path_on_removable_media = false; m_export_path_on_removable_media = false;
// invalidate_step expects the mutex to be locked. // invalidate_step expects the mutex to be locked.

2
src/slic3r/GUI/MainFrame.cpp
View File

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