author | paule <paule> | 2007-01-31 05:11:56 (UTC) |
---|---|---|
committer | paule <paule> | 2007-01-31 05:11:56 (UTC) |
commit | 3a2db1ba1395a6d33de421ed5f3b04df53ced5bc (patch) (side-by-side diff) | |
tree | 19af403919546824965303db78820a3f2a176bda | |
parent | f4e6ede30d494ad91fdbd0fd72498ef3a44bf7ee (diff) | |
download | opie-3a2db1ba1395a6d33de421ed5f3b04df53ced5bc.zip opie-3a2db1ba1395a6d33de421ed5f3b04df53ced5bc.tar.gz opie-3a2db1ba1395a6d33de421ed5f3b04df53ced5bc.tar.bz2 |
Specify correct parameters to needToAuthenticate() and login() so that appropriate setting is read when determining whether to authenticate or not. Fixes bug #1830.
-rw-r--r-- | core/launcher/serverapp.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/launcher/serverapp.cpp b/core/launcher/serverapp.cpp index 6fe0479..0e92040 100644 --- a/core/launcher/serverapp.cpp +++ b/core/launcher/serverapp.cpp @@ -577,9 +577,9 @@ void ServerApplication::togglePower() loggedin = 0; m_suspendTime = QDateTime::currentDateTime(); #ifdef QWS - if ( Opie::Security::MultiauthPassword::needToAuthenticate ( true ) && qt_screen ) { + if ( Opie::Security::MultiauthPassword::needToAuthenticate ( false ) && qt_screen ) { // Should use a big black window instead. // But this would not show up fast enough QGfx *g = qt_screen-> screenGfx ( ); g-> fillRect ( 0, 0, qt_screen-> width ( ), qt_screen-> height ( )); @@ -596,9 +596,9 @@ void ServerApplication::togglePower() QCopEnvelope( "QPE/Card", "mtabChanged()" ); // might have changed while asleep } if ( wasloggedin ) - login ( true ); + login ( false ); execAutoStart(m_suspendTime); //qcopBridge->closeOpenConnections(); |