diff options
| author | Lukas Matena <lukasmatena@seznam.cz> | 2020-02-21 13:58:18 +0300 |
|---|---|---|
| committer | Lukas Matena <lukasmatena@seznam.cz> | 2020-02-21 14:53:51 +0300 |
| commit | 91cabe5832467cf546c4f000ceda9cc2c287a89e (patch) | |
| tree | c29d4690776d1a9ab685a2ed7d148b54abd813e5 /src/slic3r/GUI/Plater.cpp | |
| parent | a877147afd5a400310b526d50f2ec867aa6579ee (diff) | |
Fixed few more encoding issues
All uncovered after disabling unsafe wxString conversions
Diffstat (limited to 'src/slic3r/GUI/Plater.cpp')
| -rw-r--r-- | src/slic3r/GUI/Plater.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index 8296e15d5..9e003aac5 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -322,7 +322,7 @@ PresetBitmapComboBox(parent, wxSize(15 * wxGetApp().em_unit(), -1)), dialog.CenterOnParent(); if (dialog.ShowModal() == wxID_OK) { - colors->values[extruder_idx] = dialog.GetColourData().GetColour().GetAsString(wxC2S_HTML_SYNTAX); + colors->values[extruder_idx] = dialog.GetColourData().GetColour().GetAsString(wxC2S_HTML_SYNTAX).ToStdString(); DynamicPrintConfig cfg_new = *cfg; cfg_new.set_key_value("extruder_colour", colors); @@ -3077,7 +3077,7 @@ unsigned int Plater::priv::update_background_process(bool force_validation, bool GUI::show_error(this->q, _(err)); } else { // Show the error message once the main window gets activated. - this->delayed_error_message = _(err); + this->delayed_error_message = _(err).ToUTF8(); } return_state |= UPDATE_BACKGROUND_PROCESS_INVALID; } |