From c87802ce659565ed60330164fd6a906d120705b1 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Tue, 13 Apr 2021 02:51:52 +0400 Subject: [PATCH] Move GTK initialization before Qt initialization To ensure Qt doesn't load GTK earlier than us and gdk_set_allowed_backends respected --- .../SourceFiles/platform/linux/specific_linux.cpp | 13 +++++++------ Telegram/lib_base | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp index eb9f63bea..7ea7d2a1a 100644 --- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp +++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp @@ -747,8 +747,13 @@ void start() { if (const auto integration = BaseGtkIntegration::Instance()) { integration->prepareEnvironment(); + integration->load(); } else { - g_warning("GTK integration is disabled, some feature unavailable."); + g_warning("GTK integration is disabled, some features unavailable."); + } + + if (const auto integration = GtkIntegration::Instance()) { + integration->load(); } #ifdef DESKTOP_APP_USE_PACKAGED_RLOTTIE @@ -947,11 +952,7 @@ namespace ThirdParty { void start() { if (const auto integration = BaseGtkIntegration::Instance()) { - integration->load(); - } - - if (const auto integration = GtkIntegration::Instance()) { - integration->load(); + integration->initializeSettings(); } SetGtkScaleFactor(); diff --git a/Telegram/lib_base b/Telegram/lib_base index 32b7db64c..40eafc24d 160000 --- a/Telegram/lib_base +++ b/Telegram/lib_base @@ -1 +1 @@ -Subproject commit 32b7db64c5ec44dadd95a4024dfd1e8c8d23fa12 +Subproject commit 40eafc24d1fba3d4652d6a262797d50a0b91f7f8