1 files changed, 11 insertions, 1 deletions

diff --git a/core/opie-login/main.cpp b/core/opie-login/main.cpp
index 8f795e3..579a93a 100644
--- a/core/opie-login/main.cpp
+++ b/core/opie-login/main.cpp
@@ -41,12 +41,13 @@
 #include <string.h>
 
 #include <qpe/qpeapplication.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/qpestyle.h>
 #include <qpe/power.h>
+#include <qpe/config.h>
 
 #include <opie/odevice.h>
 
 #include <qwindowsystem_qws.h>
 #include <qmessagebox.h>
 #include <qlabel.h>
@@ -161,21 +162,30 @@ int main ( int argc, char **argv )
                                 app-> exec ( );
                                 delete app;
                                 qApp = 0;
                         }
                 }
                 else {
+                        if ( !autolog ) {
+                                Config cfg ( "opie-login" );
+                                cfg. setGroup ( "General" );
+                                QString user = cfg. readEntry ( "AutoLogin" );
+                                
+                                if ( !user. isEmpty ( ))
+                                        autolog = ::strdup ( user. latin1 ( ));
+                        }
+                
                         if ( autolog ) {
                                 LoginApplication::setLoginAs ( autolog );
 
                                 if ( LoginApplication::changeIdentity ( ))
                                         ::exit ( LoginApplication::login ( ));
                                 else
                                         ::exit ( 0 );
                         }
-                        else
+                        else 
                                 ::exit ( login_main ( argc, argv ));
                 }
         }
         return 0;
 }