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

Fix double wizard on incompatible bundle

Browse source
This commit is contained in:
Vojtech Kral 2019-05-17 15:04:15 +02:00
parent e354a306e6
commit 9c288df1b6
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

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

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