Diffstat (limited to 'noncore/settings/networksettings2/opietooth2/Opietooth.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/settings/networksettings2/opietooth2/Opietooth.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/noncore/settings/networksettings2/opietooth2/Opietooth.cpp b/noncore/settings/networksettings2/opietooth2/Opietooth.cpp index fc30bf8..e23fc9c 100644 --- a/noncore/settings/networksettings2/opietooth2/Opietooth.cpp +++ b/noncore/settings/networksettings2/opietooth2/Opietooth.cpp | |||
@@ -423,49 +423,49 @@ OTScan::OTScan( QWidget * parent, OTIcons * _IC ) : | |||
423 | } | 423 | } |
424 | 424 | ||
425 | OTScan::~OTScan() { | 425 | OTScan::~OTScan() { |
426 | if( MyIcons ) | 426 | if( MyIcons ) |
427 | delete Icons; | 427 | delete Icons; |
428 | OTGateway::releaseOTGateway(); | 428 | OTGateway::releaseOTGateway(); |
429 | 429 | ||
430 | // send all peers that we do not care about states | 430 | // send all peers that we do not care about states |
431 | QListViewItem * Lit = DetectedPeers_LV->firstChild(); | 431 | QListViewItem * Lit = DetectedPeers_LV->firstChild(); |
432 | while( Lit ) { | 432 | while( Lit ) { |
433 | ((PeerLVI *)Lit)->peer()->stopFindingOutState( ); | 433 | ((PeerLVI *)Lit)->peer()->stopFindingOutState( ); |
434 | Lit = Lit->nextSibling(); | 434 | Lit = Lit->nextSibling(); |
435 | } | 435 | } |
436 | } | 436 | } |
437 | 437 | ||
438 | // static scan dialog function | 438 | // static scan dialog function |
439 | int OTScan::getDevice( OTPeer *& Peer, | 439 | int OTScan::getDevice( OTPeer *& Peer, |
440 | int & Channel, | 440 | int & Channel, |
441 | OTGateway * OT, | 441 | OTGateway * OT, |
442 | const UUIDVector & Filter, | 442 | const UUIDVector & Filter, |
443 | QWidget* Parent ) { | 443 | QWidget* Parent ) { |
444 | bool IsUp = 0; | 444 | bool IsUp = 0; |
445 | unsigned int i; | 445 | unsigned int i; |
446 | 446 | ||
447 | if( ! OT->isEnabled() ) { | 447 | if( ! OT || ! OT->isEnabled() ) { |
448 | QMessageBox::warning( 0, | 448 | QMessageBox::warning( 0, |
449 | tr("Scanning problem"), | 449 | tr("Scanning problem"), |
450 | tr("Bluetooth not enabled" ) | 450 | tr("Bluetooth not enabled" ) |
451 | ); | 451 | ); |
452 | return QDialog::Rejected; | 452 | return QDialog::Rejected; |
453 | } | 453 | } |
454 | 454 | ||
455 | // check if bluetooth is up | 455 | // check if bluetooth is up |
456 | OTDriverList & DL = OT->getDriverList(); | 456 | OTDriverList & DL = OT->getDriverList(); |
457 | for( i = 0; | 457 | for( i = 0; |
458 | i < DL.count(); | 458 | i < DL.count(); |
459 | i ++ ) { | 459 | i ++ ) { |
460 | if( DL[i]->isUp() ) { | 460 | if( DL[i]->isUp() ) { |
461 | // one device that is up found | 461 | // one device that is up found |
462 | IsUp = 1; | 462 | IsUp = 1; |
463 | break; | 463 | break; |
464 | } | 464 | } |
465 | } | 465 | } |
466 | 466 | ||
467 | // use this driver | 467 | // use this driver |
468 | OT->setScanWith( OT->driver(i) ); | 468 | OT->setScanWith( OT->driver(i) ); |
469 | 469 | ||
470 | // create dialog | 470 | // create dialog |
471 | QDialog * Dlg = new QDialog( Parent, 0, TRUE ); | 471 | QDialog * Dlg = new QDialog( Parent, 0, TRUE ); |