From f24e271119de3528c546c44e472cbe414664696f Mon Sep 17 00:00:00 2001 From: Sergey Radionov Date: Sat, 5 Sep 2020 22:29:41 +0700 Subject: [PATCH] Some minor issues are fixed (#212) * It's just waste of resources to use temp variable to call static members also, according to docs, QString::fromStdString already take care about utf8 conversion, so there is no need to do std::string -> C string -> QString conversion. * Don't try use tray actions if tray is not available. It just leads to the crash. --- src/gui/qt-daemon/application/mainwindow.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/gui/qt-daemon/application/mainwindow.cpp b/src/gui/qt-daemon/application/mainwindow.cpp index 80777b98..78a1ac0d 100644 --- a/src/gui/qt-daemon/application/mainwindow.cpp +++ b/src/gui/qt-daemon/application/mainwindow.cpp @@ -941,9 +941,12 @@ QString MainWindow::set_localization_strings(const QString param) else { m_localization = lr.strings; - m_quit_action->setText(QString().fromUtf8(m_localization[localization_id_quit].c_str())); - m_restore_action->setText(QString().fromUtf8(m_localization[localization_id_tray_menu_show].c_str())); - m_minimize_action->setText(QString().fromUtf8(m_localization[localization_id_tray_menu_minimize].c_str())); + if(m_quit_action) + m_quit_action->setText(QString::fromStdString(m_localization[localization_id_quit])); + if(m_restore_action) + m_restore_action->setText(QString::fromStdString(m_localization[localization_id_tray_menu_show])); + if(m_minimize_action) + m_minimize_action->setText(QString::fromStdString(m_localization[localization_id_tray_menu_minimize])); resp.error_code = API_RETURN_CODE_OK; LOG_PRINT_L0("New localization set, language title: " << lr.language_title << ", strings " << lr.strings.size()); }