From: | "Andreas HAttel (dilfridge)" <dilfridge@g.o> |
---|---|
To: | gentoo-commits@l.g.o |
Subject: | [gentoo-commits] gentoo-x86 commit in kde-base/kdelibs/files: kdelibs-4.6.0-logoutcrash.patch |
Date: | Wed, 02 Feb 2011 02:11:45 |
Message-Id: | 20110202021133.AE22220057@flycatcher.gentoo.org |
1 | dilfridge 11/02/02 02:11:33 |
2 | |
3 | Added: kdelibs-4.6.0-logoutcrash.patch |
4 | Log: |
5 | Added fix for crash on logout/reboot/shutdown. Thanks lxnay and aseigo. Sleep is overrated. |
6 | |
7 | (Portage version: 2.1.9.35/cvs/Linux x86_64) |
8 | |
9 | Revision Changes Path |
10 | 1.1 kde-base/kdelibs/files/kdelibs-4.6.0-logoutcrash.patch |
11 | |
12 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdelibs/files/kdelibs-4.6.0-logoutcrash.patch?rev=1.1&view=markup |
13 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdelibs/files/kdelibs-4.6.0-logoutcrash.patch?rev=1.1&content-type=text/plain |
14 | |
15 | Index: kdelibs-4.6.0-logoutcrash.patch |
16 | =================================================================== |
17 | commit 709f75ac353cd735ccac31f87363ea90dde345d3 |
18 | Author: Marco Martin <notmart@×××××.com> |
19 | Date: Tue Feb 1 21:15:49 2011 +0100 |
20 | |
21 | don't collapse when it's destroying |
22 | try to not crash upon deletion of the extender |
23 | |
24 | diff --git a/plasma/extenders/extenderitem.cpp b/plasma/extenders/extenderitem.cpp |
25 | index bdbc886..3e5809f 100644 |
26 | --- a/plasma/extenders/extenderitem.cpp |
27 | +++ b/plasma/extenders/extenderitem.cpp |
28 | @@ -596,6 +596,10 @@ void ExtenderItem::destroy() |
29 | |
30 | void ExtenderItem::setCollapsed(bool collapsed) |
31 | { |
32 | + if (extender()->d->destroying) { |
33 | + return; |
34 | + } |
35 | + |
36 | config().writeEntry("isCollapsed", collapsed); |
37 | d->collapsed = collapsed; |
38 | d->collapseIcon->setToolTip(collapsed ? i18n("Expand this widget") : i18n("Collapse this widget")); |