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

Fix PlaterWorker not calling yield from main thread

Browse source 
Also fix UIThreadWorker not setting busy cursor
This commit is contained in:
tamasmeszaros 2022-06-01 15:39:07 +02:00
parent fe9ad66e84
commit cf16dafad9
2 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/slic3r/GUI/Jobs/PlaterWorker.hpp
View file

@ -38,22 +38,24 @@ class PlaterWorker: public Worker {
void update_status(int st, const std::string &msg = "") override
{
wxWakeUpIdle();
ctl.update_status(st, msg);
// If the worker is not using additional threads, the UI
// is refreshed with this call. If the worker is running
// in it's own thread, the yield should not have any
// visible effects.
wxYieldIfNeeded();
// in it's own thread, this will be one additional
// evaluation of the event loop which should have no visible
// effects.
call_on_main_thread([] { wxYieldIfNeeded(); });
}
bool was_canceled() const override { return ctl.was_canceled(); }
std::future<void> call_on_main_thread(std::function<void()> fn) override
{
auto ftr = ctl.call_on_main_thread(std::move(fn));
wxWakeUpIdle();
return ctl.call_on_main_thread(std::move(fn));
return ftr;
}
} wctl{c};

10
src/slic3r/GUI/Jobs/UIThreadWorker.hpp
View file

@ -62,7 +62,15 @@ protected:
std::future<void> call_on_main_thread(std::function<void()> fn) override
{
return std::async(std::launch::deferred, [fn]{ fn(); });
std::future<void> ftr = std::async(std::launch::deferred, [fn]{ fn(); });
// So, it seems that the destructor of std::future will not call the
// packaged function. The future needs to be accessed at least ones
// or waited upon. Calling wait() instead of get() will keep the
// returned future's state valid.
ftr.wait();
return ftr;
}
public: