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

Re-use the Wayland AutoDestroyer's lifetime in WaylandIntegration::Private

Browse Source
This commit is contained in:
Ilya Fedin 2023-09-16 04:13:37 +04:00 committed by John Preston
parent 7dbf331e18
commit ad87c2a15e
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,7 +42,6 @@ struct WaylandIntegration::Private : public AutoDestroyer<QtWayland::wl_registry
QtWayland::org_kde_plasma_surface plasmaSurface(QWindow *window); QtWayland::org_kde_plasma_surface plasmaSurface(QWindow *window);
std::optional<PlasmaShell> plasmaShell; std::optional<PlasmaShell> plasmaShell;
rpl::lifetime lifetime;
protected: protected:
void registry_global( void registry_global(
@ -129,7 +128,7 @@ WaylandIntegration *WaylandIntegration::Instance() {
&QObject::destroyed &QObject::destroyed
) | rpl::start_with_next([] { ) | rpl::start_with_next([] {
instance = std::nullopt; instance = std::nullopt;
}, instance->_private->lifetime); }, instance->_private->lifetime());
return true; return true;
}(); }();
if (!instance) return nullptr; if (!instance) return nullptr;