diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-06-14 19:20:46 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-06-14 19:20:46 -0400 |
| commit | f7fd1d99d87f11c41cf09f881b1aeb950a3c8e13 (patch) | |
| tree | 95910fb3078e1136e35aaa6d9f0f251cdb4ca1a8 /libre/kdelibs-libre/fix-xfreepixmap-call.patch | |
| parent | 09c1bb45d89c78a9fd80c7a500cb29a0908dc668 (diff) | |
| parent | cd640e7ca0a8968edf887d03db8224334f663e84 (diff) | |
Merge branch 'master' of git://projects.parabolagnulinux.org/abslibre
Diffstat (limited to 'libre/kdelibs-libre/fix-xfreepixmap-call.patch')
| -rw-r--r-- | libre/kdelibs-libre/fix-xfreepixmap-call.patch | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/libre/kdelibs-libre/fix-xfreepixmap-call.patch b/libre/kdelibs-libre/fix-xfreepixmap-call.patch deleted file mode 100644 index 5f5354633..000000000 --- a/libre/kdelibs-libre/fix-xfreepixmap-call.patch +++ /dev/null @@ -1,24 +0,0 @@ -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()); - } |