segfault fixed

1 files changed, 6 insertions, 2 deletions

diff --git a/noncore/net/opietooth/applet/bluezapplet.cpp b/noncore/net/opietooth/applet/bluezapplet.cpp
index b662ff7..39a9c6e 100644
--- a/noncore/net/opietooth/applet/bluezapplet.cpp
+++ b/noncore/net/opietooth/applet/bluezapplet.cpp
@@ -33,69 +33,73 @@
 #include <qpe/resource.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/resource.h>
 #include <qpe/config.h>
 
 #include <qpoint.h>
 #include <qpainter.h>
 #include <qlayout.h>
 #include <qframe.h>
 #include <qpixmap.h>
 #include <qstring.h>
 #include <qtimer.h>
 #include <qpopupmenu.h>
 
 #include <device.h>
 
 namespace OpieTooth {
 
     BluezApplet::BluezApplet( QWidget *parent, const char *name ) : QWidget( parent, name ) {
         setFixedHeight( 18 );
         setFixedWidth( 14 );
         bluezOnPixmap = Resource::loadPixmap( "bluetoothapplet/bluezon" );
         bluezOffPixmap = Resource::loadPixmap( "bluetoothapplet/bluezoff" );
         //    bluezDiscoveryOnPixmap = Resource::loadPixmap( "bluetoothapplet/magglass" );
         startTimer(5000);
         timerEvent(NULL);
     }
 
     BluezApplet::~BluezApplet() {
     }
 
     int BluezApplet::checkBluezStatus() {
-        if (btDevice->isLoaded() ) {
-            return 1;
+      if (btDevice) {
+	if (btDevice->isLoaded() ) {
+	  return 1;
         } else {
             return 0;
         }
+      } else {
+	return 0;
+      }
     }
 
     int BluezApplet::setBluezStatus(int c) {
 
         if (c == 1) {
             btDevice = new Device("/dev/ttySB0", "scr" );
             // system("hciattach /dev/ttySB0 csr");
             //system("hcid");
         } else {
             if (btDevice) {
                 delete btDevice;
             }
             //system("killall hciattach");
             //system("killall hcid");
         }
         return 0;
     }
 
     int BluezApplet::checkBluezDiscoveryStatus() {
     }
 
     int BluezApplet::setBluezDiscoveryStatus(int d) {
     }
 
     void BluezApplet::mousePressEvent( QMouseEvent *) {
 
         QPopupMenu *menu = new QPopupMenu();
         QPopupMenu *signal = new QPopupMenu();
         int ret=0;
 
         /* Refresh active state */
         timerEvent(NULL);