3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-19 12:47:50 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

FIX: special char # in printer file name

Browse source 
Change-Id: If9553108acc4b84c9d8824c995d3b0f607da7687
This commit is contained in:
chunmao.guo 2023-06-16 11:50:06 +08:00 • committed by Lane.Wei
parent ee11ca6eeb
commit d164cd0265
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -631,7 +631,7 @@ void PrinterFileSystem::DownloadNextFile()
if (!download->ofs) return FILE_OPEN_ERR;
}
if (download->total && (download->size != prog.size || download->total != prog.total)) {
wxLogWarning("PrinterFileSystem::DownloadNextFile data error: %d != %d\n", download->size, download->size);
wxLogWarning("PrinterFileSystem::DownloadNextFile data error: %d != %d\n", download->size, prog.size);
}
// receive data
download->ofs.write((char const *) data, size);
@ -875,7 +875,7 @@ void PrinterFileSystem::UpdateFocusThumbnail2(std::shared_ptr<std::vector<File>>
[this, files, type](int result, File const &file) {
auto n = file.name.find_last_of('.');
auto name = n == std::string::npos ? file.name : file.name.substr(0, n) + ".mp4";
n = file.path.find_last_of('#');
n = (type == ModelMetadata) ? std::string::npos : file.path.find_last_of('#');
auto path = n == std::string::npos ? file.path : file.path.substr(0, n);
auto iter = path.empty() ? std::find_if(m_file_list.begin(), m_file_list.end(), [&name](auto &f) { return f.name == name; }) :
std::find_if(m_file_list.begin(), m_file_list.end(), [&path](auto &f) { return f.path == path; });