mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-08-31 14:45:14 +00:00
Code Issues Releases Wiki Activity

Ensure Wayland integration instance accessor doesn't leak

Browse Source
This commit is contained in:
Ilya Fedin
2023-06-16 11:59:40 +04:00
committed by John Preston
parent c9179b78b3
commit a3cdf19c1f
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp
View File

@@ -123,12 +123,15 @@ WaylandIntegration::~WaylandIntegration() = default;
WaylandIntegration *WaylandIntegration::Instance() { WaylandIntegration *WaylandIntegration::Instance() {
if (!IsWayland()) return nullptr; if (!IsWayland()) return nullptr;
static std::optional<WaylandIntegration> instance(std::in_place); static std::optional<WaylandIntegration> instance(std::in_place);
base::qt_signal_producer( [[maybe_unused]] static const auto Inited = [] {
QGuiApplication::platformNativeInterface(), base::qt_signal_producer(
&QObject::destroyed QGuiApplication::platformNativeInterface(),
) | rpl::start_with_next([&] { &QObject::destroyed
instance = std::nullopt; ) | rpl::start_with_next([] {
}, instance->_private->lifetime); instance = std::nullopt;
}, instance->_private->lifetime);
return true;
}();
if (!instance) return nullptr; if (!instance) return nullptr;
return &*instance; return &*instance;
} }

2
Telegram/lib_base

Submodule Telegram/lib_base updated: e0763c0c7a...249814b334

2
Telegram/lib_ui

Submodule Telegram/lib_ui updated: 1e89c19a03...8a56048801