mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-09-11 11:07:40 +00:00
hotfix: system bundles being copied from resources folder on every startup (#15627)
# Description <!-- > Please provide a summary of the changes made in this PR. Include details such as: > * What issue does this PR address or fix? > * What new features or enhancements does this PR introduce? > * Are there any breaking changes or dependencies that need to be considered? --> #15416 introduced a bug that caused system profiles to be copied over to the system folder in the roaming folder on every startup. # Screenshots/Recordings/Graphs <!-- > Please attach relevant screenshots to showcase the UI changes. > Please attach images that can help explain the changes. --> ## Tests <!-- > Please describe the tests that you have conducted to verify the changes made in this PR. --> <!-- > A guide for users on how to download the artifacts from this PR. --> [How to Download Pull Requests Artifacts for Testing](https://www.orcaslicer.com/wiki/how_to_download_pr_artifacts)
This commit is contained in:
@@ -1106,8 +1106,8 @@ void PresetUpdater::priv::check_installed_vendor_profiles() const
|
|||||||
|
|
||||||
const auto is_vendor_enabled = (vendor_name == PresetBundle::ORCA_DEFAULT_BUNDLE) // always update configs from resource to vendor for ORCA_DEFAULT_BUNDLE
|
const auto is_vendor_enabled = (vendor_name == PresetBundle::ORCA_DEFAULT_BUNDLE) // always update configs from resource to vendor for ORCA_DEFAULT_BUNDLE
|
||||||
|| (enabled_vendors.find(vendor_name) != enabled_vendors.end());
|
|| (enabled_vendors.find(vendor_name) != enabled_vendors.end());
|
||||||
if (enabled_config_update) {
|
if (is_vendor_installed(vendor_name)) {
|
||||||
if (is_vendor_installed(vendor_name)) {
|
if (enabled_config_update) {
|
||||||
if (is_vendor_enabled) {
|
if (is_vendor_enabled) {
|
||||||
// Orca: whichever form of the vendor resources ships at the newer
|
// Orca: whichever form of the vendor resources ships at the newer
|
||||||
// version is the one installing lays down, and the one to judge
|
// version is the one installing lays down, and the one to judge
|
||||||
@@ -1122,17 +1122,12 @@ void PresetUpdater::priv::check_installed_vendor_profiles() const
|
|||||||
<< resource_ver.to_string() << " from resource, old version " << vendor_ver.to_string();
|
<< resource_ver.to_string() << " from resource, old version " << vendor_ver.to_string();
|
||||||
bundles.insert(vendor_name);
|
bundles.insert(vendor_name);
|
||||||
}
|
}
|
||||||
}
|
} else {
|
||||||
else {
|
// need to be removed because not installed
|
||||||
//need to be removed because not installed
|
|
||||||
remove_installed_vendor(vendor_name);
|
remove_installed_vendor(vendor_name);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (is_vendor_enabled) {
|
} else if (is_vendor_enabled) {
|
||||||
bundles.insert(vendor_name);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else if (is_vendor_enabled) {
|
|
||||||
bundles.insert(vendor_name);
|
bundles.insert(vendor_name);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user