summaryrefslogtreecommitdiff
path: root/libre/kdelibs-libre/fix-xfreepixmap-call.patch
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2013-05-12 01:16:13 -0700
committerroot <root@rshg054.dnsready.net>2013-05-12 01:16:13 -0700
commit5b9e0d821dd428792bd51ed03af2b800924ce69d (patch)
treee789152a7a0fd6ae4eb0a7d0e572d392f81beca4 /libre/kdelibs-libre/fix-xfreepixmap-call.patch
parent207b7c7b0d7bc0db898a2386a665bdb20495fb19 (diff)
Sun May 12 01:15:39 PDT 2013
Diffstat (limited to 'libre/kdelibs-libre/fix-xfreepixmap-call.patch')
-rw-r--r--libre/kdelibs-libre/fix-xfreepixmap-call.patch24
1 files changed, 24 insertions, 0 deletions
diff --git a/libre/kdelibs-libre/fix-xfreepixmap-call.patch b/libre/kdelibs-libre/fix-xfreepixmap-call.patch
new file mode 100644
index 000000000..5f5354633
--- /dev/null
+++ b/libre/kdelibs-libre/fix-xfreepixmap-call.patch
@@ -0,0 +1,24 @@
+commit 9323adac35d40da69e3cb18504340e984c4afd05
+Author: Anne-Marie Mahfouf <annma@kde.org>
+Date: Fri May 10 17:12:33 2013 +0200
+
+ Fix crash when quitting apps
+
+ Backport to 4.10 branch
+
+ CCBUG: 319137
+
+diff --git a/plasma/private/dialogshadows.cpp b/plasma/private/dialogshadows.cpp
+index b54fb1a..1925670 100644
+--- a/plasma/private/dialogshadows.cpp
++++ b/plasma/private/dialogshadows.cpp
+@@ -336,6 +336,9 @@ void DialogShadows::Private::freeX11Pixmaps()
+ {
+ #ifdef Q_WS_X11
+ foreach (const QPixmap &pixmap, m_shadowPixmaps) {
++ if (!QX11Info::display()) {
++ return;
++ }
+ if (!pixmap.isNull()) {
+ XFreePixmap(QX11Info::display(), pixmap.handle());
+ }