summaryrefslogtreecommitdiffstats
path: root/kdesktop
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-09-16 07:19:58 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-09-16 07:19:58 +0000
commit7b1017d0013a2900b82cdf36bd2a9ef387c9aec5 (patch)
treeb16a72a532f28396dcaa1a6f269cfe92a8c18f0d /kdesktop
parent96c46c4f95bc317b7742d1569672dc4310e17fe4 (diff)
downloadtdebase-7b1017d0013a2900b82cdf36bd2a9ef387c9aec5.tar.gz
tdebase-7b1017d0013a2900b82cdf36bd2a9ef387c9aec5.zip
Stabilize the SAK system
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1253985 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdesktop')
-rw-r--r--kdesktop/lockeng.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/kdesktop/lockeng.cc b/kdesktop/lockeng.cc
index 49be555f3..0612860a7 100644
--- a/kdesktop/lockeng.cc
+++ b/kdesktop/lockeng.cc
@@ -223,8 +223,6 @@ void SaverEngine::slotSAKProcessExited()
{
mLockProcess.kill( SIGHUP );
}
-
- TQTimer::singleShot( 0, this, TQT_SLOT(handleSecureDialog()) );
}
}
@@ -372,6 +370,9 @@ void SaverEngine::lockProcessExited()
}
processLockTransactions();
mState = Waiting;
+ if (trinity_lockeng_sak_available == TRUE) {
+ handleSecureDialog();
+ }
}
//---------------------------------------------------------------------------