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

Fixing previous commit on AppConfig and loading newer configuration.

Browse Source
This commit is contained in:
Vojtech Bubnik 2021-12-15 11:22:44 +01:00
parent 87880022fc
commit 12756e7979
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/slic3r/GUI/GUI_App.cpp
View File

@ -990,8 +990,6 @@ std::string GUI_App::check_older_app_config(Semver current_version, bool backup)
BOOST_LOG_TRIVIAL(error) << "Failed to take congiguration snapshot: "; BOOST_LOG_TRIVIAL(error) << "Failed to take congiguration snapshot: ";
} }
// This will tell later (when config folder structure is sure to exists) to copy files from older_data_dir_path
m_init_app_config_from_older = true;
// load app config from older file // load app config from older file
std::string error = app_config->load((boost::filesystem::path(older_data_dir_path) / filename).string()); std::string error = app_config->load((boost::filesystem::path(older_data_dir_path) / filename).string());
if (!error.empty()) { if (!error.empty()) {
@ -1115,9 +1113,9 @@ bool GUI_App::on_init_inner()
std::string older_data_dir_path; std::string older_data_dir_path;
if (m_app_conf_exists) { if (m_app_conf_exists) {
if (app_config->orig_version() && *app_config->orig_version() < *Semver::parse(SLIC3R_VERSION)) if (app_config->orig_version().valid() && app_config->orig_version() < *Semver::parse(SLIC3R_VERSION))
// Only copying configuration if it was saved with a newer slicer than the one currently running. // Only copying configuration if it was saved with a newer slicer than the one currently running.
older_data_dir_path = check_older_app_config(*app_config->orig_version(), true); older_data_dir_path = check_older_app_config(app_config->orig_version(), true);
} else { } else {
// No AppConfig exists, fresh install. Always try to copy from an alternate location, don't make backup of the current configuration. // No AppConfig exists, fresh install. Always try to copy from an alternate location, don't make backup of the current configuration.
older_data_dir_path = check_older_app_config(Semver(), false); older_data_dir_path = check_older_app_config(Semver(), false);