Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/prusa3d/PrusaSlicer.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVojtech Bubnik <bubnikv@gmail.com>2021-12-15 13:22:44 +0300
committerVojtech Bubnik <bubnikv@gmail.com>2021-12-15 13:22:44 +0300
commit12756e7979263bbb88321553f582c95ee83d2fc5 (patch)
treeb0e33b710f1c08ef89a8c1987946d2462eb856f6
parent87880022fcc59cb6a2eaed155bdcd636993a35a0 (diff)
Fixing previous commit on AppConfig and loading newer configuration.
-rw-r--r--src/slic3r/GUI/GUI_App.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp
index 522546100..8f8b30d8b 100644
--- a/src/slic3r/GUI/GUI_App.cpp
+++ b/src/slic3r/GUI/GUI_App.cpp
@@ -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: ";
}
- // 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
std::string error = app_config->load((boost::filesystem::path(older_data_dir_path) / filename).string());
if (!error.empty()) {
@@ -1115,9 +1113,9 @@ bool GUI_App::on_init_inner()
std::string older_data_dir_path;
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.
- 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 {
// 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);