From e8297a9284e2cf9fe79a4a3d5d650756c9fb769b Mon Sep 17 00:00:00 2001 From: tpearson Date: Tue, 13 Sep 2011 19:45:30 +0000 Subject: [PATCH] Second part of prior commit git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1253274 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kdesktop/lock/lockprocess.cc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc index 71b377227..528fa9cfc 100644 --- a/kdesktop/lock/lockprocess.cc +++ b/kdesktop/lock/lockprocess.cc @@ -1140,6 +1140,12 @@ bool LockProcess::startHack() { if (currentDialog || (!mDialogs.isEmpty())) { + // no resuming with dialog visible or when not visible + if (backingPixmap.isNull()) + setBackgroundColor(black); + else + setBackgroundPixmap(backingPixmap); + erase(); return false; }