diff options
| author | Lukas Matena <lukasmatena@seznam.cz> | 2020-02-25 17:43:54 +0300 |
|---|---|---|
| committer | Lukas Matena <lukasmatena@seznam.cz> | 2020-02-25 17:53:01 +0300 |
| commit | aa8c97803c966b6c40c87e03bd2617d884acd1cd (patch) | |
| tree | 8bc441c510c5bce46531f68c093940e7476eb5a7 /src/slic3r/GUI | |
| parent | c326b31c92b4288d5520b50fa883e5587d86583e (diff) | |
Fix of #3695
Ternary operator is given wxString and std::string, which does not work when implicit conversions between std::string and wxString are disabled
Diffstat (limited to 'src/slic3r/GUI')
| -rw-r--r-- | src/slic3r/GUI/DoubleSlider.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/slic3r/GUI/DoubleSlider.cpp b/src/slic3r/GUI/DoubleSlider.cpp index 9afbb73ed..5bc054dd4 100644 --- a/src/slic3r/GUI/DoubleSlider.cpp +++ b/src/slic3r/GUI/DoubleSlider.cpp @@ -1010,7 +1010,7 @@ wxString Control::get_tooltip(int tick/*=-1*/) tick_code_it->gcode == ToolChangeCode ? from_u8((boost::format(_utf8(L("Extruder (tool) is changed to Extruder \"%1%\""))) % tick_code_it->extruder ).str()) : - tick_code_it->gcode; + from_u8(tick_code_it->gcode); // If tick is marked as a conflict (exclamation icon), // we should to explain why |