kotatogram/lib_ui
1
0
Fork 0
Code Issues Activity

Ensure Wayland integration instance accessor doesn't leak

Browse source
This commit is contained in:
Ilya Fedin 2023-06-16 11:59:16 +04:00 • committed by John Preston
parent 3749f10e7f
commit 8a56048801
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
ui/platform/linux/ui_linux_wayland_integration.cpp
View file

@ -68,12 +68,15 @@ WaylandIntegration::~WaylandIntegration() = default;
WaylandIntegration *WaylandIntegration::Instance() { WaylandIntegration *WaylandIntegration::Instance() {
if (!::Platform::IsWayland()) return nullptr; if (!::Platform::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;
} }