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

Revert "Fix double wizard on incompatible bundle"

Browse source 
This reverts commit 9c288df1b6.
This commit is contained in:
Vojtech Kral 2019-05-17 17:35:15 +02:00
parent c1cb40c4f0
commit b205daa437
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -183,6 +183,7 @@ bool GUI_App::on_init_inner()
// supplied as argument to --datadir; in that case we should still run the wizard // supplied as argument to --datadir; in that case we should still run the wizard
preset_bundle->setup_directories(); preset_bundle->setup_directories();
app_conf_exists = app_config->exists();
// load settings // load settings
if (app_config->exists()) if (app_config->exists())
app_config->load(); app_config->load();
@ -257,7 +258,7 @@ bool GUI_App::on_init_inner()
} }
CallAfter([this] { CallAfter([this] {
if (!config_wizard_startup(app_config->exists())) { if (!config_wizard_startup(app_conf_exists)) {
// Only notify if there was no wizard so as not to bother too much ... // Only notify if there was no wizard so as not to bother too much ...
preset_updater->slic3r_update_notify(); preset_updater->slic3r_update_notify();
} }

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

@ -72,6 +72,7 @@ static wxString dots("…", wxConvUTF8);
class GUI_App : public wxApp class GUI_App : public wxApp
{ {
bool m_initialized { false }; bool m_initialized { false };
bool app_conf_exists{ false };
wxColour m_color_label_modified; wxColour m_color_label_modified;
wxColour m_color_label_sys; wxColour m_color_label_sys;