| -rw-r--r-- | noncore/settings/networksettings2/editconnection.cpp | 5 | ||||
| -rw-r--r-- | noncore/settings/networksettings2/opietooth2/Opietooth.cpp | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/noncore/settings/networksettings2/editconnection.cpp b/noncore/settings/networksettings2/editconnection.cpp index a9bef65..d948fb9 100644 --- a/noncore/settings/networksettings2/editconnection.cpp +++ b/noncore/settings/networksettings2/editconnection.cpp @@ -245,12 +245,13 @@ void EditNetworkSetup::setNetworkSetup( NetworkSetup * NC ) { if( ! Found ) { // this means that this level is NOT present in collection - // probably INCOMPATIBEL collection OR Missing plugin + // probably INCOMPATIBLE collection OR Missing plugin + QString pluginName = NNI ? NNI->nodeClass()->name() : ""; QMessageBox::warning( 0, tr( "Error presentig NetworkSetup" ), tr( "<p>Old NetworkSetup or missing plugin \"<i>%1</i>\"</p>" ). - arg(NNI->nodeClass()->name()) ); + arg(pluginName) ); return; } 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 @@ -444,7 +444,7 @@ int OTScan::getDevice( OTPeer *& Peer, bool IsUp = 0; unsigned int i; - if( ! OT->isEnabled() ) { + if( ! OT || ! OT->isEnabled() ) { QMessageBox::warning( 0, tr("Scanning problem"), tr("Bluetooth not enabled" ) |