diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-09-13 19:45:30 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-09-13 19:45:30 +0000 |
| commit | e8297a9284e2cf9fe79a4a3d5d650756c9fb769b (patch) | |
| tree | c628bd3dc6d21e3c83ecc181e076a37536c2b727 /kdesktop/lock | |
| parent | 94b61aed0707e9eca84a818a5281542be03b9ca3 (diff) | |
| download | tdebase-e8297a9284e2cf9fe79a4a3d5d650756c9fb769b.tar.gz tdebase-e8297a9284e2cf9fe79a4a3d5d650756c9fb769b.zip | |
Second part of prior commit
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1253274 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdesktop/lock')
| -rw-r--r-- | kdesktop/lock/lockprocess.cc | 6 |
1 files changed, 6 insertions, 0 deletions
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; } |