diff --git a/Telegram/SourceFiles/core/application.cpp b/Telegram/SourceFiles/core/application.cpp index 5fefd6522..0f2feeefc 100644 --- a/Telegram/SourceFiles/core/application.cpp +++ b/Telegram/SourceFiles/core/application.cpp @@ -183,24 +183,6 @@ Application::~Application() { void Application::run() { Kotato::JsonSettings::Start(); - if (!cMainFont().isEmpty()) { - style::internal::CustomMainFont = cMainFont(); - } - if (!cSemiboldFont().isEmpty()) { - style::internal::CustomSemiboldFont = cSemiboldFont(); - } - if (cSemiboldFontIsBold()) { - style::internal::CustomSemiboldIsBold = cSemiboldFontIsBold(); - } - if (!cMonospaceFont().isEmpty()) { - style::internal::CustomMonospaceFont = cMonospaceFont(); - } - if (cUseSystemFont()) { - style::internal::UseSystemFont = cUseSystemFont(); - } - if (cUseOriginalMetrics()) { - style::internal::UseOriginalMetrics = cUseOriginalMetrics(); - } style::internal::StartFonts(); ThirdParty::start(); diff --git a/Telegram/SourceFiles/core/ui_integration.cpp b/Telegram/SourceFiles/core/ui_integration.cpp index 07708466a..6fb45f071 100644 --- a/Telegram/SourceFiles/core/ui_integration.cpp +++ b/Telegram/SourceFiles/core/ui_integration.cpp @@ -54,6 +54,24 @@ void UiIntegration::activationFromTopPanel() { void UiIntegration::startFontsBegin() { Platform::FallbackFontConfigCheckBegin(); + if (!cMainFont().isEmpty()) { + style::internal::CustomMainFont = cMainFont(); + } + if (!cSemiboldFont().isEmpty()) { + style::internal::CustomSemiboldFont = cSemiboldFont(); + } + if (cSemiboldFontIsBold()) { + style::internal::CustomSemiboldIsBold = cSemiboldFontIsBold(); + } + if (!cMonospaceFont().isEmpty()) { + style::internal::CustomMonospaceFont = cMonospaceFont(); + } + if (cUseSystemFont()) { + style::internal::UseSystemFont = cUseSystemFont(); + } + if (cUseOriginalMetrics()) { + style::internal::UseOriginalMetrics = cUseOriginalMetrics(); + } } void UiIntegration::startFontsEnd() {