author | zecke <zecke> | 2003-10-04 07:28:05 (UTC) |
---|---|---|
committer | zecke <zecke> | 2003-10-04 07:28:05 (UTC) |
commit | 23f729eb7487ad189591c3b0c9af9d3afecd3b91 (patch) (unidiff) | |
tree | 83b7efa5996ffcbf22f36b370505eb11fdece4ff | |
parent | 364d30ca7c212a531b79bb7cbceb8af7a0130f2c (diff) | |
download | opie-23f729eb7487ad189591c3b0c9af9d3afecd3b91.zip opie-23f729eb7487ad189591c3b0c9af9d3afecd3b91.tar.gz opie-23f729eb7487ad189591c3b0c9af9d3afecd3b91.tar.bz2 |
Avoid crashing on no mouse driver
-rw-r--r-- | core/apps/calibrate/main.cpp | 3 | ||||
-rw-r--r-- | core/opie-login/main.cpp | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/core/apps/calibrate/main.cpp b/core/apps/calibrate/main.cpp index 1c295eb..ec9b5ec 100644 --- a/core/apps/calibrate/main.cpp +++ b/core/apps/calibrate/main.cpp | |||
@@ -30,13 +30,14 @@ | |||
30 | int main( int argc, char ** argv ) | 30 | int main( int argc, char ** argv ) |
31 | { | 31 | { |
32 | QPEApplication a( argc, argv ); | 32 | QPEApplication a( argc, argv ); |
33 | int retval = 0; | 33 | int retval = 0; |
34 | 34 | ||
35 | #ifdef QWS | 35 | #ifdef QWS |
36 | if ( QWSServer::mouseHandler() ->inherits("QCalibratedMouseHandler") ) { | 36 | if ( QWSServer::mouseHandler() && |
37 | QWSServer::mouseHandler() ->inherits("QCalibratedMouseHandler") ) { | ||
37 | #endif | 38 | #endif |
38 | // Make sure calibration widget starts on top. | 39 | // Make sure calibration widget starts on top. |
39 | Calibrate cal; | 40 | Calibrate cal; |
40 | a.setMainWidget(&cal); | 41 | a.setMainWidget(&cal); |
41 | a.showMainWidget(&cal); | 42 | a.showMainWidget(&cal); |
42 | return a.exec(); | 43 | return a.exec(); |
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 | |||
@@ -337,13 +337,14 @@ int login_main ( int argc, char **argv, pid_t ppid ) | |||
337 | 337 | ||
338 | app-> setFont ( QFont ( "Helvetica", 10 )); | 338 | app-> setFont ( QFont ( "Helvetica", 10 )); |
339 | app-> setStyle ( new QPEStyle ( )); | 339 | app-> setStyle ( new QPEStyle ( )); |
340 | 340 | ||
341 | ODevice::inst ( )-> setSoftSuspend ( true ); | 341 | ODevice::inst ( )-> setSoftSuspend ( true ); |
342 | 342 | ||
343 | if ( QWSServer::mouseHandler() ->inherits("QCalibratedMouseHandler") ) { | 343 | if ( QWSServer::mouseHandler() && |
344 | QWSServer::mouseHandler() ->inherits("QCalibratedMouseHandler") ) { | ||
344 | if ( !QFile::exists ( "/etc/pointercal" )) { | 345 | if ( !QFile::exists ( "/etc/pointercal" )) { |
345 | // Make sure calibration widget starts on top. | 346 | // Make sure calibration widget starts on top. |
346 | Calibrate *cal = new Calibrate; | 347 | Calibrate *cal = new Calibrate; |
347 | cal-> exec ( ); | 348 | cal-> exec ( ); |
348 | delete cal; | 349 | delete cal; |
349 | } | 350 | } |