Force repaint of background on desktop switch when desktop lock is enabled

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1253273 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 9 insertions, 2 deletions

diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc
index 48bdb1395..71b377227 100644
--- a/kdesktop/lock/lockprocess.cc
+++ b/kdesktop/lock/lockprocess.cc
@@ -1325,8 +1325,15 @@ void LockProcess::suspend()
 
 void LockProcess::resume( bool force )
 {
-    if( !force && (!mDialogs.isEmpty() || !mVisibility ))
-        return; // no resuming with dialog visible or when not visible
+    if( !force && (!mDialogs.isEmpty() || !mVisibility )) {
+        // no resuming with dialog visible or when not visible
+	if (backingPixmap.isNull())
+		setBackgroundColor(black);
+	else
+		setBackgroundPixmap(backingPixmap);
+	erase();
+        return;
+    }
     if ((mSuspended) && (mHackProc.isRunning()))
     {
         XForceScreenSaver(qt_xdisplay(), ScreenSaverReset );