viewit/OrcaSlicer-KX
5
4
Fork 1
Code Issues 3 Pull Requests Packages Projects Releases 3 Wiki Activity

Fix for #7328 - Filename containing chars not usable on FAT result in error and crash in gcode export

Browse Source
This commit is contained in:
YuSanka
2021-11-23 13:43:08 +01:00
parent 2a0a7d0b30
commit 1724673dd4
4 changed files with 42 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,6 +3,7 @@
#include "GUI.hpp"
#include "I18N.hpp"
#include "BitmapComboBox.hpp"
#include "Plater.hpp"
#include <wx/dc.h>
#ifdef wxHAS_GENERIC_DATAVIEWCTRL
@ -222,14 +223,8 @@ bool BitmapTextRenderer::GetValueFromEditorCtrl(wxWindow* ctrl, wxVariant& value
if (!text_editor || text_editor->GetValue().IsEmpty())
return false;
std::string chosen_name = into_u8(text_editor->GetValue());
const char* unusable_symbols = "<>:/\\|?*\"";
for (size_t i = 0; i < std::strlen(unusable_symbols); i++) {
if (chosen_name.find_first_of(unusable_symbols[i]) != std::string::npos) {
m_was_unusable_symbol = true;
return false;
}
}
if (m_was_unusable_symbol = Slic3r::GUI::Plater::has_illegal_filename_characters(text_editor->GetValue()))
return false;
// The icon can't be edited so get its old value and reuse it.
wxVariant valueOld;