Avoid crashing on no mouse driver

1 files changed, 7 insertions, 6 deletions

diff --git a/core/opie-login/main.cpp b/core/opie-login/main.cpp
index 7dcb5f6..2103216 100644
--- a/core/opie-login/main.cpp
+++ b/core/opie-login/main.cpp
@@ -108,5 +108,5 @@ int main ( int argc, char **argv )
         ::setsid ( );
 
-                ::signal ( SIGTERM, sigterm );
+        ::signal ( SIGTERM, sigterm );
         ::signal ( SIGINT, sigterm );
 
@@ -161,5 +161,5 @@ int main ( int argc, char **argv )
                         if ( killedbysig ) {  // qpe was killed by an uncaught signal
                                 qApp = 0;
-                                
+
                                 ::syslog ( LOG_ERR, "Opie was killed by a signal #%d", killedbysig );
 
@@ -188,9 +188,9 @@ int main ( int argc, char **argv )
                                 cfg. setGroup ( "General" );
                                 QString user = cfg. readEntry ( "AutoLogin" );
-                                
+
                                 if ( !user. isEmpty ( ))
                                         autolog = ::strdup ( user. latin1 ( ));
                         }
-                
+
                         if ( autolog && !userExited ) {
 
@@ -200,5 +200,5 @@ int main ( int argc, char **argv )
                 LoginApplication *app = new LoginApplication ( argc, argv, ppid );
                 LoginApplication::setLoginAs ( autolog );
-  
+
 
                                 if ( LoginApplication::changeIdentity ( ))
@@ -341,5 +341,6 @@ int login_main ( int argc, char **argv, pid_t ppid )
         ODevice::inst ( )-> setSoftSuspend ( true );
 
-        if ( QWSServer::mouseHandler() ->inherits("QCalibratedMouseHandler") ) {
+        if ( QWSServer::mouseHandler() &&
+             QWSServer::mouseHandler() ->inherits("QCalibratedMouseHandler") ) {
                 if ( !QFile::exists ( "/etc/pointercal" )) {
                         // Make sure calibration widget starts on top.