From a7ffd2a6fe5408a135c1b7c33da33613bc3b63a7 Mon Sep 17 00:00:00 2001 From: bubnikv Date: Fri, 21 Feb 2020 13:38:06 +0100 Subject: 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. --- src/slic3r/GUI/Plater.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/slic3r/GUI/Plater.cpp') 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(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; } -- cgit v1.2.3