Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_lines_g2_g3
This commit is contained in:
commit
2defd32260
1 changed files with 6 additions and 1 deletions
|
@ -4,6 +4,7 @@
|
||||||
#include "Job.hpp"
|
#include "Job.hpp"
|
||||||
|
|
||||||
#include <wx/utils.h>
|
#include <wx/utils.h>
|
||||||
|
#include <boost/log/trivial.hpp>
|
||||||
|
|
||||||
namespace Slic3r { namespace GUI {
|
namespace Slic3r { namespace GUI {
|
||||||
|
|
||||||
|
@ -16,7 +17,11 @@ struct CursorSetterRAII
|
||||||
}
|
}
|
||||||
~CursorSetterRAII()
|
~CursorSetterRAII()
|
||||||
{
|
{
|
||||||
ctl.call_on_main_thread([] { wxEndBusyCursor(); });
|
try {
|
||||||
|
ctl.call_on_main_thread([] { wxEndBusyCursor(); });
|
||||||
|
} catch(...) {
|
||||||
|
BOOST_LOG_TRIVIAL(error) << "Can't revert cursor from busy to normal";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue