summaryrefslogtreecommitdiff
authorpaule <paule>2007-01-31 05:11:56 (UTC)
committer paule <paule>2007-01-31 05:11:56 (UTC)
commit3a2db1ba1395a6d33de421ed5f3b04df53ced5bc (patch) (unidiff)
tree19af403919546824965303db78820a3f2a176bda
parentf4e6ede30d494ad91fdbd0fd72498ef3a44bf7ee (diff)
downloadopie-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.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/serverapp.cpp4
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
@@ -575,13 +575,13 @@ void ServerApplication::togglePower()
575 575
576 bool wasloggedin = loggedin; 576 bool wasloggedin = loggedin;
577 loggedin = 0; 577 loggedin = 0;
578 m_suspendTime = QDateTime::currentDateTime(); 578 m_suspendTime = QDateTime::currentDateTime();
579 579
580#ifdef QWS 580#ifdef QWS
581 if ( Opie::Security::MultiauthPassword::needToAuthenticate ( true ) && qt_screen ) { 581 if ( Opie::Security::MultiauthPassword::needToAuthenticate ( false ) && qt_screen ) {
582 // Should use a big black window instead. 582 // Should use a big black window instead.
583 // But this would not show up fast enough 583 // But this would not show up fast enough
584 QGfx *g = qt_screen-> screenGfx ( ); 584 QGfx *g = qt_screen-> screenGfx ( );
585 g-> fillRect ( 0, 0, qt_screen-> width ( ), qt_screen-> height ( )); 585 g-> fillRect ( 0, 0, qt_screen-> width ( ), qt_screen-> height ( ));
586 delete g; 586 delete g;
587 } 587 }
@@ -594,13 +594,13 @@ void ServerApplication::togglePower()
594 594
595 { 595 {
596 QCopEnvelope( "QPE/Card", "mtabChanged()" ); // might have changed while asleep 596 QCopEnvelope( "QPE/Card", "mtabChanged()" ); // might have changed while asleep
597 } 597 }
598 598
599 if ( wasloggedin ) 599 if ( wasloggedin )
600 login ( true ); 600 login ( false );
601 601
602 execAutoStart(m_suspendTime); 602 execAutoStart(m_suspendTime);
603 //qcopBridge->closeOpenConnections(); 603 //qcopBridge->closeOpenConnections();
604 604
605 excllock = false; 605 excllock = false;
606} 606}