diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-05-13 12:53:48 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-05-13 12:53:48 -0400 |
| commit | f6fde4b83792b43883cdccac2a46145d48cef42d (patch) | |
| tree | 9de2ea480baf7073f53b3bf5d88dc1e48cbf9fa0 /libre/kdelibs-libre/fix-xfreepixmap-call.patch | |
| parent | 78bf47e43de121f3460b6c6f608bd5f5b8a85f28 (diff) | |
| parent | 3bc640f96a0afc77163253ad0ed504057c8e7e00 (diff) | |
| download | abslibre-f6fde4b83792b43883cdccac2a46145d48cef42d.tar.gz abslibre-f6fde4b83792b43883cdccac2a46145d48cef42d.tar.bz2 abslibre-f6fde4b83792b43883cdccac2a46145d48cef42d.zip | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/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, 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()); + } |