author | harlekin <harlekin> | 2002-06-01 23:55:11 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-06-01 23:55:11 (UTC) |
commit | 34b68507898f2a01333281a7293d0bbd3c6d77ee (patch) (unidiff) | |
tree | 3a620603d62d9c6bc52c00bf08c3f207c7814763 | |
parent | 4f60b99a11c74a297c2471fd272735c9d8f9611f (diff) | |
download | opie-34b68507898f2a01333281a7293d0bbd3c6d77ee.zip opie-34b68507898f2a01333281a7293d0bbd3c6d77ee.tar.gz opie-34b68507898f2a01333281a7293d0bbd3c6d77ee.tar.bz2 |
segfault fixed
-rw-r--r-- | noncore/net/opietooth/applet/bluezapplet.cpp | 4 |
1 files changed, 4 insertions, 0 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 | |||
@@ -53,29 +53,33 @@ namespace OpieTooth { | |||
53 | setFixedWidth( 14 ); | 53 | setFixedWidth( 14 ); |
54 | bluezOnPixmap = Resource::loadPixmap( "bluetoothapplet/bluezon" ); | 54 | bluezOnPixmap = Resource::loadPixmap( "bluetoothapplet/bluezon" ); |
55 | bluezOffPixmap = Resource::loadPixmap( "bluetoothapplet/bluezoff" ); | 55 | bluezOffPixmap = Resource::loadPixmap( "bluetoothapplet/bluezoff" ); |
56 | // bluezDiscoveryOnPixmap = Resource::loadPixmap( "bluetoothapplet/magglass" ); | 56 | // bluezDiscoveryOnPixmap = Resource::loadPixmap( "bluetoothapplet/magglass" ); |
57 | startTimer(5000); | 57 | startTimer(5000); |
58 | timerEvent(NULL); | 58 | timerEvent(NULL); |
59 | } | 59 | } |
60 | 60 | ||
61 | BluezApplet::~BluezApplet() { | 61 | BluezApplet::~BluezApplet() { |
62 | } | 62 | } |
63 | 63 | ||
64 | int BluezApplet::checkBluezStatus() { | 64 | int BluezApplet::checkBluezStatus() { |
65 | if (btDevice) { | ||
65 | if (btDevice->isLoaded() ) { | 66 | if (btDevice->isLoaded() ) { |
66 | return 1; | 67 | return 1; |
67 | } else { | 68 | } else { |
68 | return 0; | 69 | return 0; |
69 | } | 70 | } |
71 | } else { | ||
72 | return 0; | ||
73 | } | ||
70 | } | 74 | } |
71 | 75 | ||
72 | int BluezApplet::setBluezStatus(int c) { | 76 | int BluezApplet::setBluezStatus(int c) { |
73 | 77 | ||
74 | if (c == 1) { | 78 | if (c == 1) { |
75 | btDevice = new Device("/dev/ttySB0", "scr" ); | 79 | btDevice = new Device("/dev/ttySB0", "scr" ); |
76 | // system("hciattach /dev/ttySB0 csr"); | 80 | // system("hciattach /dev/ttySB0 csr"); |
77 | //system("hcid"); | 81 | //system("hcid"); |
78 | } else { | 82 | } else { |
79 | if (btDevice) { | 83 | if (btDevice) { |
80 | delete btDevice; | 84 | delete btDevice; |
81 | } | 85 | } |