summaryrefslogtreecommitdiffstats
path: root/kde/kdelibs/kdelibs-4.6.0-fix-crash-in-plasma.patch
diff options
context:
space:
mode:
authorsibel <lesibel@free.fr>2011-02-03 10:49:29 +0100
committersibel <lesibel@free.fr>2011-02-03 10:49:29 +0100
commitdba59f0be544b54ea83f7c27ebe437f49b26e263 (patch)
treeec8fd74005094ea8ae7a96a0c0d0a56149ebe67a /kde/kdelibs/kdelibs-4.6.0-fix-crash-in-plasma.patch
parent2f375c25ecb42591e2ede476ba84b06295ebd863 (diff)
downloadnutyx-extra-dba59f0be544b54ea83f7c27ebe437f49b26e263.tar.gz
nutyx-extra-dba59f0be544b54ea83f7c27ebe437f49b26e263.tar.bz2
nutyx-extra-dba59f0be544b54ea83f7c27ebe437f49b26e263.tar.xz
nutyx-extra-dba59f0be544b54ea83f7c27ebe437f49b26e263.zip
kdelibs, diverses corrections 4.6.0-4
Diffstat (limited to 'kde/kdelibs/kdelibs-4.6.0-fix-crash-in-plasma.patch')
-rw-r--r--kde/kdelibs/kdelibs-4.6.0-fix-crash-in-plasma.patch22
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"));