From 89b11ef0845020b5608c58cfde9b0dfe1229b1f0 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Thu, 29 Apr 2021 19:49:49 +0400 Subject: [PATCH] Move gtk initialization back to ThirdParty::start --- Telegram/SourceFiles/platform/linux/specific_linux.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp index 7ea7d2a1a..339f61c5d 100644 --- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp +++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp @@ -747,15 +747,10 @@ void start() { if (const auto integration = BaseGtkIntegration::Instance()) { integration->prepareEnvironment(); - integration->load(); } else { g_warning("GTK integration is disabled, some features unavailable."); } - if (const auto integration = GtkIntegration::Instance()) { - integration->load(); - } - #ifdef DESKTOP_APP_USE_PACKAGED_RLOTTIE g_warning( "Application has been built with foreign rlottie, " @@ -952,9 +947,14 @@ namespace ThirdParty { void start() { if (const auto integration = BaseGtkIntegration::Instance()) { + integration->load(); integration->initializeSettings(); } + if (const auto integration = GtkIntegration::Instance()) { + integration->load(); + } + SetGtkScaleFactor(); // wait for interface announce to know if native window frame is supported