3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-30 12:11:15 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Fix usage of CallAfter vs modal dialogs in slic3r.cpp, fix #1778

Browse source
This commit is contained in:
Vojtech Kral 2019-02-05 18:12:42 +01:00
parent 4fc73965d3
commit c3ea735bc8
3 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/slic3r.cpp
View file

@ -131,6 +131,9 @@ int main(int argc, char **argv)
GUI::GUI_App *gui = new GUI::GUI_App();
GUI::GUI_App::SetInstance(gui);
gui->CallAfter([gui, &input_files, &cli_config, &extra_config, &print_config] {
if (! gui->initialized()) {
return;
}
#if 0
// Load the cummulative config over the currently active profiles.
//FIXME if multiple configs are loaded, only the last one will have an effect.

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

@ -197,7 +197,7 @@ bool GUI_App::OnInit()
mainframe->Show(true);
return true;
return m_initialized = true;
}
unsigned GUI_App::get_colour_approx_luma(const wxColour &colour)

2
src/slic3r/GUI/GUI_App.hpp
View file

@ -71,6 +71,7 @@ static wxString dots("…", wxConvUTF8);
class GUI_App : public wxApp
{
bool m_initialized { false };
bool app_conf_exists{ false };
wxColour m_color_label_modified;
@ -90,6 +91,7 @@ class GUI_App : public wxApp
public:
bool OnInit() override;
bool initialized() const { return m_initialized; }
GUI_App();