From fe0e6c3a0439786ea85d4bdac96d6cbfc781734d Mon Sep 17 00:00:00 2001 From: Cacodemon345 Date: Sat, 12 Feb 2022 20:15:21 +0600 Subject: [PATCH] qt: Set font after loading translations --- src/qt/qt_main.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/qt/qt_main.cpp b/src/qt/qt_main.cpp index 150dae8ed..c05ee3980 100644 --- a/src/qt/qt_main.cpp +++ b/src/qt/qt_main.cpp @@ -141,11 +141,7 @@ int main(int argc, char* argv[]) { #endif QApplication app(argc, argv); QLocale::setDefault(QLocale::C); -#ifdef Q_OS_WINDOWS - auto font_name = QObject::tr("FONT_NAME"); - auto font_size = QObject::tr("FONT_SIZE"); - QApplication::setFont(QFont(font_name, font_size.toInt())); -#endif + qt_set_sequence_auto_mnemonic(false); Q_INIT_RESOURCE(qt_resources); Q_INIT_RESOURCE(qt_translations); @@ -165,6 +161,11 @@ int main(int argc, char* argv[]) { return 0; } ProgSettings::loadTranslators(&app); +#ifdef Q_OS_WINDOWS + auto font_name = QObject::tr("FONT_NAME"); + auto font_size = QObject::tr("FONT_SIZE"); + QApplication::setFont(QFont(font_name, font_size.toInt())); +#endif if (! pc_init_modules()) { ui_msgbox_header(MBX_FATAL, (void*)IDS_2120, (void*)IDS_2056); return 6;