From ad87c2a15e58b8be864c7e38a157bc96e1f28d7a Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Sat, 16 Sep 2023 04:13:37 +0400 Subject: [PATCH] Re-use the Wayland AutoDestroyer's lifetime in WaylandIntegration::Private --- .../SourceFiles/platform/linux/linux_wayland_integration.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp b/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp index c6b5397d5..0c60115a5 100644 --- a/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp +++ b/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp @@ -42,7 +42,6 @@ struct WaylandIntegration::Private : public AutoDestroyer plasmaShell; - rpl::lifetime lifetime; protected: void registry_global( @@ -129,7 +128,7 @@ WaylandIntegration *WaylandIntegration::Instance() { &QObject::destroyed ) | rpl::start_with_next([] { instance = std::nullopt; - }, instance->_private->lifetime); + }, instance->_private->lifetime()); return true; }(); if (!instance) return nullptr;