Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/supermerill/SuperSlicer.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbubnikv <bubnikv@gmail.com>2020-02-21 15:38:06 +0300
committerbubnikv <bubnikv@gmail.com>2020-02-21 15:38:06 +0300
commita7ffd2a6fe5408a135c1b7c33da33613bc3b63a7 (patch)
tree1c3c7725f2c729c5538315938a147441e4e4ef31 /src/slic3r/GUI/Plater.cpp
parent0486e412f4dc2618a79b81db093bb7dbfa5aa842 (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/Plater.cpp')
-rw-r--r--src/slic3r/GUI/Plater.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp
index 9e003aac5..14f24a999 100644
--- a/src/slic3r/GUI/Plater.cpp
+++ b/src/slic3r/GUI/Plater.cpp
@@ -3074,10 +3074,10 @@ unsigned int Plater::priv::update_background_process(bool force_validation, bool
auto *top_level_wnd = dynamic_cast<wxTopLevelWindow*>(p);
if (! postpone_error_messages && top_level_wnd && top_level_wnd->IsActive()) {
// The error returned from the Print needs to be translated into the local language.
- GUI::show_error(this->q, _(err));
+ GUI::show_error(this->q, err);
} else {
// Show the error message once the main window gets activated.
- this->delayed_error_message = _(err).ToUTF8();
+ this->delayed_error_message = err;
}
return_state |= UPDATE_BACKGROUND_PROCESS_INVALID;
}