From c12d3bbd3307177cedba88534c9d4fe0d53780e4 Mon Sep 17 00:00:00 2001 From: Quentin Date: Fri, 12 Jun 2020 23:55:38 +0200 Subject: [PATCH] [Fix] Toolbox crash --- escher/src/message_text_view.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/escher/src/message_text_view.cpp b/escher/src/message_text_view.cpp index 8b9a0a214..4285cfcf4 100644 --- a/escher/src/message_text_view.cpp +++ b/escher/src/message_text_view.cpp @@ -5,17 +5,14 @@ MessageTextView::MessageTextView(const KDFont * font, I18n::Message message, float horizontalAlignment, float verticalAlignment, KDColor textColor, KDColor backgroundColor) : TextView(font, horizontalAlignment, verticalAlignment, textColor, backgroundColor), - m_message(message) + m_message(message), m_text(nullptr) { } const char * MessageTextView::text() const { - if (m_message != I18n::Message::Default && m_text == nullptr) - return I18n::translate(m_message); - if (m_text != nullptr && m_message == I18n::Message::Default) + if (m_text != nullptr) return m_text; - assert(false); - return nullptr; + return I18n::translate(m_message); } void MessageTextView::setText(const char * text) {