juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-09-09 10:16:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #123 from Snapmaker/dev_bug_fixed_2.3.0_alves

Browse Source 
Dev bug fixed 2.3.0 alves
This commit is contained in:
Alves
2026-01-19 16:49:13 +08:00
committed by GitHub
parent a24ee96a29 77095bc863
commit d3b58c788d
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/slic3r/GUI/WebGuideDialog.cpp
View File

@@ -1056,6 +1056,18 @@ int GuideFrame::LoadProfileData()
} }
loaded_vendors.insert(PresetBundle::ORCA_FILAMENT_LIBRARY); loaded_vendors.insert(PresetBundle::ORCA_FILAMENT_LIBRARY);
// Load Snapmaker vendor first to ensure it appears at the top of the machine list
auto sm_bundle_name = boost::filesystem::path(PresetBundle::SM_BUNDLE).replace_extension(".json");
if (boost::filesystem::exists(vendor_dir / sm_bundle_name)) {
LoadProfileFamily(PresetBundle::SM_BUNDLE, (vendor_dir / sm_bundle_name).string());
loaded_vendors.insert(PresetBundle::SM_BUNDLE);
} else if (boost::filesystem::exists(rsrc_vendor_dir / sm_bundle_name)) {
LoadProfileFamily(PresetBundle::SM_BUNDLE, (rsrc_vendor_dir / sm_bundle_name).string());
loaded_vendors.insert(PresetBundle::SM_BUNDLE);
}
if (m_destroy)
return 0;
//load custom bundle from user data path //load custom bundle from user data path
boost::filesystem::directory_iterator endIter; boost::filesystem::directory_iterator endIter;
for (boost::filesystem::directory_iterator iter(vendor_dir); iter != endIter; iter++) { for (boost::filesystem::directory_iterator iter(vendor_dir); iter != endIter; iter++) {