diff --git a/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp b/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp index 1df54e3da5..e6af77b708 100644 --- a/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp +++ b/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp @@ -55,6 +55,7 @@ WaylandIntegration::WaylandIntegration() { } WaylandIntegration *WaylandIntegration::Instance() { + if (!IsWayland()) return nullptr; static WaylandIntegration instance; return &instance; } diff --git a/Telegram/SourceFiles/platform/linux/linux_wayland_integration_dummy.cpp b/Telegram/SourceFiles/platform/linux/linux_wayland_integration_dummy.cpp index f6c6b39fe5..e79fd2d95e 100644 --- a/Telegram/SourceFiles/platform/linux/linux_wayland_integration_dummy.cpp +++ b/Telegram/SourceFiles/platform/linux/linux_wayland_integration_dummy.cpp @@ -7,6 +7,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ #include "platform/linux/linux_wayland_integration.h" +#include "base/platform/base_platform_info.h" + namespace Platform { namespace internal { @@ -14,6 +16,7 @@ WaylandIntegration::WaylandIntegration() { } WaylandIntegration *WaylandIntegration::Instance() { + if (!IsWayland()) return nullptr; static WaylandIntegration instance; return &instance; } diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp index 6cb1d00f37..2f9f3d35b2 100644 --- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp +++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp @@ -809,8 +809,7 @@ bool SkipTaskbarSupported() { } bool StartSystemMove(QWindow *window) { - if (IsWayland()) { - const auto integration = WaylandIntegration::Instance(); + if (const auto integration = WaylandIntegration::Instance()) { return integration->startMove(window); } else { return StartXCBMoveResize(window, 16); @@ -818,8 +817,7 @@ bool StartSystemMove(QWindow *window) { } bool StartSystemResize(QWindow *window, Qt::Edges edges) { - if (IsWayland()) { - const auto integration = WaylandIntegration::Instance(); + if (const auto integration = WaylandIntegration::Instance()) { return integration->startResize(window, edges); } else { return StartXCBMoveResize(window, edges); @@ -827,8 +825,7 @@ bool StartSystemResize(QWindow *window, Qt::Edges edges) { } bool ShowWindowMenu(QWindow *window) { - if (IsWayland()) { - const auto integration = WaylandIntegration::Instance(); + if (const auto integration = WaylandIntegration::Instance()) { return integration->showWindowMenu(window); } else { return ShowXCBWindowMenu(window);