diff options
| author | bubnikv <bubnikv@gmail.com> | 2020-02-21 15:38:06 +0300 |
|---|---|---|
| committer | bubnikv <bubnikv@gmail.com> | 2020-02-21 15:38:06 +0300 |
| commit | a7ffd2a6fe5408a135c1b7c33da33613bc3b63a7 (patch) | |
| tree | 1c3c7725f2c729c5538315938a147441e4e4ef31 /src/slic3r/GUI/Tab.cpp | |
| parent | 0486e412f4dc2618a79b81db093bb7dbfa5aa842 (diff) | |
GUI::show_error() is now generalized for std::string and const char*
Fixed return type of std::string translate_utf8() with context
(incorrectly returned wxString, should return std::string).
Fixed double translation of BackgroundSlicingProcess::validate() in Plater.
Diffstat (limited to 'src/slic3r/GUI/Tab.cpp')
| -rw-r--r-- | src/slic3r/GUI/Tab.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp index ed3a93007..fefc8e113 100644 --- a/src/slic3r/GUI/Tab.cpp +++ b/src/slic3r/GUI/Tab.cpp @@ -3032,7 +3032,7 @@ void Tab::save_preset(std::string name /*= ""*/) const Preset &preset = m_presets->get_selected_preset(); auto default_name = preset.is_default ? "Untitled" : // preset.is_system ? (boost::format(_utf8(L("%1% - Copy"))) % preset.name).str() : - preset.is_system ? (boost::format(_CTX_utf8(L_CONTEXT("%1% - Copy", "PresetName"), "PresetName").ToUTF8()) % preset.name).str() : + preset.is_system ? (boost::format(_CTX_utf8(L_CONTEXT("%1% - Copy", "PresetName"), "PresetName")) % preset.name).str() : preset.name; bool have_extention = boost::iends_with(default_name, ".ini"); |