Fix screensaver startup failure under certain circumstances, including premature xhack termination

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1253271 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
13 years ago · e29fcfc416
parent b28f50725e
commit e29fcfc416
1 changed files with 3 additions and 1 deletions
--- a/kdesktop/lock/lockprocess.cc
+++ b/kdesktop/lock/lockprocess.cc
@ -1261,7 +1261,8 @@ void LockProcess::hackExited(KProcess *)
 	else bitBlt(this, 0, 0, &backingPixmap);
 	if (!mSuspended) {
 		if (trinity_desktop_lock_use_system_modal_dialogs) {
-		ENABLE_CONTINUOUS_LOCKDLG_DISPLAY
+			ENABLE_CONTINUOUS_LOCKDLG_DISPLAY
+			mHackDelayStartupTimer->start(mHackDelayStartupTimeout, TRUE);
 		}
 	}
 }
@ -1291,6 +1292,7 @@ void LockProcess::suspend()
            mSuspended = true;
            stopHack();
            ENABLE_CONTINUOUS_LOCKDLG_DISPLAY
+            mHackDelayStartupTimer->start(mHackDelayStartupTimeout, TRUE);
        }
        else {
            TQString hackStatus;