diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-09-13 19:16:29 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-09-13 19:16:29 +0000 |
| commit | e29fcfc4166b893df9fa6825e16d41064d3bade5 (patch) | |
| tree | bc0196df6976afbe7057ddd756bbf226ea62a282 /kdesktop | |
| parent | b28f50725ea13b5fb539ed4c0ca9b002090cff5b (diff) | |
| download | tdebase-e29fcfc4166b893df9fa6825e16d41064d3bade5.tar.gz tdebase-e29fcfc4166b893df9fa6825e16d41064d3bade5.zip | |
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
Diffstat (limited to 'kdesktop')
| -rw-r--r-- | kdesktop/lock/lockprocess.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc index 6a22b6a68..48bdb1395 100644 --- 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; |