kdelibs, diverses corrections 4.6.0-4

1 files changed, 22 insertions, 0 deletions

diff --git a/kde/kdelibs/kdelibs-4.6.0-fix-crash-in-plasma.patch b/kde/kdelibs/kdelibs-4.6.0-fix-crash-in-plasma.patch
new file mode 100644
index 000000000..5fd8d0a5c
--- /dev/null
+++ b/kde/kdelibs/kdelibs-4.6.0-fix-crash-in-plasma.patch
@@ -0,0 +1,22 @@
+commit 709f75ac353cd735ccac31f87363ea90dde345d3
+Author: Marco Martin <notmart@gmail.com>
+Date:   Tue Feb 1 21:15:49 2011 +0100
+
+    don't collapse when it's destroying
+    try to not crash upon deletion of the extender
+
+diff --git a/plasma/extenders/extenderitem.cpp b/plasma/extenders/extenderitem.cpp
+index bdbc886..3e5809f 100644
+--- a/plasma/extenders/extenderitem.cpp
++++ b/plasma/extenders/extenderitem.cpp
+@@ -596,6 +596,10 @@ void ExtenderItem::destroy()
+ 
+ void ExtenderItem::setCollapsed(bool collapsed)
+ {
++    if (extender()->d->destroying) {
++        return;
++    }
++
+     config().writeEntry("isCollapsed", collapsed);
+     d->collapsed = collapsed;
+     d->collapseIcon->setToolTip(collapsed ? i18n("Expand this widget") : i18n("Collapse this widget"));