From 41fa4a05f9746c7fd14c100b5581a8a1d272ff55 Mon Sep 17 00:00:00 2001 From: Vojtech Bubnik Date: Wed, 15 Dec 2021 12:04:43 +0100 Subject: Fixing AppConfig::reset(), calling reset() before load(). This fixes some issues when importing newer configuration over the current. --- src/libslic3r/AppConfig.cpp | 6 ++++++ src/libslic3r/AppConfig.hpp | 5 +---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/libslic3r/AppConfig.cpp b/src/libslic3r/AppConfig.cpp index e64d19cfc..ec5ce3702 100644 --- a/src/libslic3r/AppConfig.cpp +++ b/src/libslic3r/AppConfig.cpp @@ -43,6 +43,10 @@ const std::string AppConfig::SECTION_MATERIALS = "sla_materials"; void AppConfig::reset() { m_storage.clear(); + m_vendors.clear(); + m_dirty = false; + m_orig_version = Semver::invalid(); + m_legacy_datadir = false; set_defaults(); }; @@ -245,6 +249,8 @@ static bool verify_config_file_checksum(boost::nowide::ifstream &ifs) std::string AppConfig::load(const std::string &path) { + this->reset(); + // 1) Read the complete config file into a boost::property_tree. namespace pt = boost::property_tree; pt::ptree tree; diff --git a/src/libslic3r/AppConfig.hpp b/src/libslic3r/AppConfig.hpp index cf69691de..418f3427b 100644 --- a/src/libslic3r/AppConfig.hpp +++ b/src/libslic3r/AppConfig.hpp @@ -22,10 +22,7 @@ public: }; explicit AppConfig(EAppMode mode) : - m_dirty(false), - m_orig_version(Semver::invalid()), - m_mode(mode), - m_legacy_datadir(false) + m_mode(mode) { this->reset(); } -- cgit v1.2.3