diff options
author | bubnikv <bubnikv@gmail.com> | 2020-03-07 18:31:14 +0300 |
---|---|---|
committer | bubnikv <bubnikv@gmail.com> | 2020-03-07 18:31:14 +0300 |
commit | 76fecc91a5465d1167a1e105876f473e2bf449dd (patch) | |
tree | 943a481a65e492585b4056fce91d319a7cf6048c /src/slic3r/GUI/ConfigWizard_private.hpp | |
parent | 93f2be7ac426c5acbaf7b30c1149d222b02ff58a (diff) |
Improved error reporting and error handling when loading
vendor config bundles into installation wizard.
Diffstat (limited to 'src/slic3r/GUI/ConfigWizard_private.hpp')
-rw-r--r-- | src/slic3r/GUI/ConfigWizard_private.hpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/slic3r/GUI/ConfigWizard_private.hpp b/src/slic3r/GUI/ConfigWizard_private.hpp index 1d4b64221..64081153d 100644 --- a/src/slic3r/GUI/ConfigWizard_private.hpp +++ b/src/slic3r/GUI/ConfigWizard_private.hpp @@ -100,13 +100,16 @@ struct Materials struct Bundle { std::unique_ptr<PresetBundle> preset_bundle; - VendorProfile *vendor_profile; - const bool is_in_resources; - const bool is_prusa_bundle; + VendorProfile *vendor_profile { nullptr }; + bool is_in_resources { false }; + bool is_prusa_bundle { false }; - Bundle(fs::path source_path, bool is_in_resources, bool is_prusa_bundle = false); + Bundle() = default; Bundle(Bundle &&other); + // Returns false if not loaded. Reason for that is logged as boost::log error. + bool load(fs::path source_path, bool is_in_resources, bool is_prusa_bundle = false); + const std::string& vendor_id() const { return vendor_profile->id; } }; |