diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-02-22 14:28:15 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-02-22 14:28:15 +0000 |
commit | aae71b4d8e684ca22d28ef0f1da0989e7bf6468d (patch) | |
tree | 0e9cf35d85726e6aa9fbd58b12035f92ffec0130 /kde-frameworks/kidletime/files | |
parent | 20ed81714fa97f5845db16a3c142b3b44d820bc4 (diff) |
gentoo auto-resync : 22:02:2023 - 14:28:15
Diffstat (limited to 'kde-frameworks/kidletime/files')
-rw-r--r-- | kde-frameworks/kidletime/files/kidletime-5.102.0-wayland-baloo-crashfix.patch | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/kde-frameworks/kidletime/files/kidletime-5.102.0-wayland-baloo-crashfix.patch b/kde-frameworks/kidletime/files/kidletime-5.102.0-wayland-baloo-crashfix.patch new file mode 100644 index 000000000000..da2faa692cd2 --- /dev/null +++ b/kde-frameworks/kidletime/files/kidletime-5.102.0-wayland-baloo-crashfix.patch @@ -0,0 +1,56 @@ +From a0da010b8c4c97792543d24f6597ba1c1b3ceaef Mon Sep 17 00:00:00 2001 +From: David Redondo <kde@david-redondo.de> +Date: Thu, 16 Feb 2023 12:16:03 +0100 +Subject: [PATCH] wayland: Guard wayland object destructors + +Kidletime is a singleton and the client API works by supplying ints to add +or remove timeouts. When not all timeouts are removed before program exits, +trying to destroy the wayland objects will crash since the lifetime of the +wayland connection is tied to the QGuiApplication. +BUG:465801 +FIXED-IN:5.104 + + +(cherry picked from commit 53779a8d8fb177762d0435634c8ca45b0a47f1db) +--- + src/plugins/wayland/poller.cpp | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +diff --git a/src/plugins/wayland/poller.cpp b/src/plugins/wayland/poller.cpp +index 918766b..9c1d7ad 100644 +--- a/src/plugins/wayland/poller.cpp ++++ b/src/plugins/wayland/poller.cpp +@@ -50,7 +50,9 @@ public: + + ~IdleTimeoutKwin() + { +- release(); ++ if (qGuiApp) { ++ release(); ++ } + } + + protected: +@@ -74,7 +76,9 @@ public: + + ~IdleTimeoutExt() + { +- destroy(); ++ if (qGuiApp) { ++ destroy(); ++ } + } + + protected: +@@ -120,7 +124,7 @@ public: + } + ~IdleManagerExt() + { +- if (isActive()) { ++ if (qGuiApp && isActive()) { + destroy(); + } + } +-- +GitLab + |