plasma5-workspace/0001-widgetexplorer-Don-t-recurse-into-applet-s-containme.patch
Fabian Vogt ccbabe322f Accepting request 1002202 from home:Vogtinator:plasma5.25
- Add patch to fix widget explorer crash (kde#458829):
  * 0001-widgetexplorer-Don-t-recurse-into-applet-s-containme.patch

OBS-URL: https://build.opensuse.org/request/show/1002202
OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/plasma5-workspace?expand=0&rev=658
2022-09-10 09:32:25 +00:00

35 lines
1.6 KiB
Diff

From 7fbac131624007745e726e7006706d0e8761e463 Mon Sep 17 00:00:00 2001
From: Nicolas Fella <nicolas.fella@gmx.de>
Date: Sun, 21 Aug 2022 16:33:50 +0200
Subject: [PATCH] [widgetexplorer] Don't recurse into applet's containments
The intention of this code appears to be finding system tray applets, since the systemtray is a containment within another applet/containment
However the code causes an infinit recursion since we are calling addContainment on the same containment again
The recursion also is unnecessary since corona->containments() already lists the system tray containment, so we don't need to find it by recursing through the panel's children
(cherry picked from commit c7ba560ccaac5e469cb2d6bf66c39e1acf967454)
---
components/shellprivate/widgetexplorer/widgetexplorer.cpp | 4 ----
1 file changed, 4 deletions(-)
diff --git a/components/shellprivate/widgetexplorer/widgetexplorer.cpp b/components/shellprivate/widgetexplorer/widgetexplorer.cpp
index bd7db9518..0022a1247 100644
--- a/components/shellprivate/widgetexplorer/widgetexplorer.cpp
+++ b/components/shellprivate/widgetexplorer/widgetexplorer.cpp
@@ -280,10 +280,6 @@ void WidgetExplorerPrivate::addContainment(Containment *containment)
foreach (Applet *applet, containment->applets()) {
if (applet->pluginMetaData().isValid()) {
- Containment *childContainment = applet->property("containment").value<Containment *>();
- if (childContainment) {
- addContainment(childContainment);
- }
runningApplets[applet->pluginMetaData().pluginId()]++;
} else {
qDebug() << "Invalid plugin metadata. :(";
--
2.37.3