3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix id_idle() for UIThreadWorker

Browse Source
This commit is contained in:
tamasmeszaros 2022-05-27 16:09:32 +02:00
parent b00c550463
commit 6ab8e3a138
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/slic3r/GUI/Jobs/UIThreadWorker.hpp
View File

@ -67,7 +67,7 @@ public:
: m_progress{pri} : m_progress{pri}
{ {
if (m_progress) if (m_progress)
m_progress->set_cancel_callback([this](){ cancel(); }); m_progress->set_cancel_callback([this]() { cancel(); });
} }
UIThreadWorker() = default; UIThreadWorker() = default;
@ -75,12 +75,14 @@ public:
bool push(std::unique_ptr<Job> job) override bool push(std::unique_ptr<Job> job) override
{ {
m_canceled = false; m_canceled = false;
m_jobqueue.push(std::move(job));
if (job)
m_jobqueue.push(std::move(job));
return bool(job); return bool(job);
} }
bool is_idle() const override { return !m_running; } bool is_idle() const override { return !m_running && m_jobqueue.empty(); }
void cancel() override { m_canceled = true; } void cancel() override { m_canceled = true; }
@ -88,7 +90,9 @@ public:
{ {
m_canceled = true; m_canceled = true;
process_front(); process_front();
while (!m_jobqueue.empty()) m_jobqueue.pop();
while (!m_jobqueue.empty())
m_jobqueue.pop();
} }
void process_events() override { void process_events() override {