amd/orcaslicer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

PresetUpdater: Fix a race condition

Browse source
This commit is contained in:
Vojtech Kral 2019-02-14 16:51:41 +01:00
parent d8c7966bec
commit e6f7af64a7
3 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/slic3r/GUI/GUI_App.cpp
View file

@ -127,6 +127,10 @@ bool GUI_App::OnInit()
app_config->save();
preset_updater = new PresetUpdater();
Bind(EVT_SLIC3R_VERSION_ONLINE, [this](const wxCommandEvent &evt) {
app_config->set("version_online", into_u8(evt.GetString()));
app_config->save();
});
load_language();

12
src/slic3r/Utils/PresetUpdater.cpp
View file

@ -103,6 +103,8 @@ static Semver get_slic3r_version()
return *res;
}
wxDEFINE_EVENT(EVT_SLIC3R_VERSION_ONLINE, wxCommandEvent);
struct PresetUpdater::priv
{
@ -225,13 +227,9 @@ void PresetUpdater::priv::sync_version() const
boost::trim(body);
BOOST_LOG_TRIVIAL(info) << boost::format("Got Slic3rPE online version: `%1%`. Sending to GUI thread...") % body;
// FIXME: race condition
// wxCommandEvent* evt = new wxCommandEvent(version_online_event);
// evt->SetString(body);
// GUI::get_app()->QueueEvent(evt);
GUI::wxGetApp().app_config->set("version_online", body);
GUI::wxGetApp().app_config->save();
wxCommandEvent* evt = new wxCommandEvent(EVT_SLIC3R_VERSION_ONLINE);
evt->SetString(GUI::from_u8(body));
GUI::wxGetApp().QueueEvent(evt);
})
.perform_sync();
}

2
src/slic3r/Utils/PresetUpdater.hpp
View file

@ -37,6 +37,8 @@ private:
std::unique_ptr<priv> p;
};
wxDECLARE_EVENT(EVT_SLIC3R_VERSION_ONLINE, wxCommandEvent);
}
#endif