3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-14 02:07:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

FIX: ModelMetadata is zipped without subpath, not substract it

Browse source 
Change-Id: I5af608b1aa312bfab79bbdea09e99f8b4b2de5de
This commit is contained in:
chunmao.guo 2023-07-12 12:25:40 +08:00 • committed by Lane.Wei
parent 02f2e51c2e
commit 031a678ea0
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/slic3r/GUI/Printer/PrinterFileSystem.cpp
View file

@ -842,7 +842,7 @@ void PrinterFileSystem::UpdateFocusThumbnail2(std::shared_ptr<std::vector<File>>
file.path = path; file.path = path;
return FILE_SIZE_ERR; return FILE_SIZE_ERR;
} }
auto n = path.find_last_of('#'); auto n = type == ModelMetadata ? std::string::npos : path.find_last_of('#'); // ModelMetadata is zipped without subpath
auto path2 = n == std::string::npos ? path : path.substr(0, n); auto path2 = n == std::string::npos ? path : path.substr(0, n);
auto iter = std::find_if(files->begin(), files->end(), [&path2](auto &f) { return f.path == path2; }); auto iter = std::find_if(files->begin(), files->end(), [&path2](auto &f) { return f.path == path2; });
if (cont) { if (cont) {
@ -851,7 +851,10 @@ void PrinterFileSystem::UpdateFocusThumbnail2(std::shared_ptr<std::vector<File>>
return 0; return 0;
} }
if (type == ModelMetadata) { if (type == ModelMetadata) {
file.local_path = iter->local_path + std::string((char *) data, size); if (iter != files->end())
file.local_path = iter->local_path + std::string((char *) data, size);
else
file.local_path = std::string((char *) data, size);
ParseThumbnail(file); ParseThumbnail(file);
} else { } else {
if (mimetype.empty()) { if (mimetype.empty()) {