UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-18 21:30:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Fix] Toolbox crash

Browse Source
This commit is contained in:
Quentin
2020-06-12 23:55:38 +02:00
parent a6162a9623
commit c12d3bbd33
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
escher/src/message_text_view.cpp
View File

@@ -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) {