GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-01 04:22:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix of sla forward compability

Browse Source
This commit is contained in:
David Kocik 2024-06-11 15:55:57 +02:00 committed by YuSanka
parent c47d761d6c
commit 68d285b6e1
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -978,7 +978,6 @@ void GUI_App::legacy_app_config_vendor_check()
if (!found_legacy_printers) { if (!found_legacy_printers) {
return; return;
} }
bool found_prusa_sla_vendor = vendor_map.find("PrusaResearchSLA") != vendor_map.end();
// make a deep copy of vendor map with moved printers // make a deep copy of vendor map with moved printers
std::map<std::string, std::map<std::string, std::set<std::string>>> new_vendor_map; std::map<std::string, std::map<std::string, std::set<std::string>>> new_vendor_map;
for (const auto& vendor : vendor_map) { for (const auto& vendor : vendor_map) {
@ -996,16 +995,12 @@ void GUI_App::legacy_app_config_vendor_check()
} }
app_config->set_vendors(new_vendor_map); app_config->set_vendors(new_vendor_map);
if (found_prusa_sla_vendor) {
// The vendor was present in appconfig, we do nothing with its ini file.
return;
}
// copy PrusaResearchSLA ini file to vendors // copy PrusaResearchSLA ini file to vendors
boost::system::error_code ec;
const boost::filesystem::path prusa_sla_in_resources = boost::filesystem::path(Slic3r::resources_dir()) / "profiles" / "PrusaResearchSLA.ini"; const boost::filesystem::path prusa_sla_in_resources = boost::filesystem::path(Slic3r::resources_dir()) / "profiles" / "PrusaResearchSLA.ini";
assert(boost::filesystem::exists(prusa_sla_in_resources)); assert(boost::filesystem::exists(prusa_sla_in_resources));
const boost::filesystem::path prusa_sla_in_vendors = boost::filesystem::path(Slic3r::data_dir()) / "vendor" / "PrusaResearchSLA.ini"; const boost::filesystem::path prusa_sla_in_vendors = boost::filesystem::path(Slic3r::data_dir()) / "vendor" / "PrusaResearchSLA.ini";
if (boost::filesystem::exists(prusa_sla_in_vendors)) { if (boost::filesystem::exists(prusa_sla_in_vendors, ec)) {
return; return;
} }
std::string message; std::string message;
@ -3457,7 +3452,7 @@ bool GUI_App::config_wizard_startup()
bool GUI_App::check_updates(const bool invoked_by_user) bool GUI_App::check_updates(const bool invoked_by_user)
{ {
if (invoked_by_user) { if (invoked_by_user) {
// do preset_updater sync so if user runs slicer for a long time, check for updates actually delivers updates. // do preset_updater sync so if user runs slicer for a long time, check for updates actually delivers updates.
// for preset_updater sync we need to sync archive database first // for preset_updater sync we need to sync archive database first
plater()->get_preset_archive_database()->sync_blocking(); plater()->get_preset_archive_database()->sync_blocking();