MrBesen
/
tdesktop
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Ensure Wayland integration instance accessor doesn't leak

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
Show Stats 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() {
if (!IsWayland()) return nullptr;
static std::optional<WaylandIntegration> instance(std::in_place);
base::qt_signal_producer(
QGuiApplication::platformNativeInterface(),
&QObject::destroyed
) | rpl::start_with_next([&] {
instance = std::nullopt;
}, instance->_private->lifetime);
[[maybe_unused]] static const auto Inited = [] {
base::qt_signal_producer(
QGuiApplication::platformNativeInterface(),
&QObject::destroyed
) | rpl::start_with_next([] {
instance = std::nullopt;
}, instance->_private->lifetime);
return true;
}();
if (!instance) return nullptr;
return &*instance;
}

2
Telegram/lib_base

@ -1 +1 @@
Subproject commit e0763c0c7ae38c89e09b0d41080293a0cb77ecde
Subproject commit 249814b3343c5ed06b56597ac870df81c77f8417

2
Telegram/lib_ui

@ -1 +1 @@
Subproject commit 1e89c19a03ddd654e063e26fbb5223247212822d
Subproject commit 8a560488011f833b7ba534999f878d20d5152e6c