diff options
Diffstat (limited to 'tdenetworkmanager/src/tdenetman-wireless_menuitem.cpp')
| -rw-r--r-- | tdenetworkmanager/src/tdenetman-wireless_menuitem.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/tdenetworkmanager/src/tdenetman-wireless_menuitem.cpp b/tdenetworkmanager/src/tdenetman-wireless_menuitem.cpp index 42497b9..5d473a9 100644 --- a/tdenetworkmanager/src/tdenetman-wireless_menuitem.cpp +++ b/tdenetworkmanager/src/tdenetman-wireless_menuitem.cpp @@ -56,15 +56,13 @@ using namespace ConnectionSettings; void WirelessNetworkItem::slotActivate() { TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(_dev)); - TDEGlobalNetworkManager* nm = TDEGlobal::networkManager(); - TDENetworkConnection* conn = nm->findConnectionByUUID(_conn); - - TDENetworkConnectionManager* deviceConnMan = dev->connectionManager(); + TDENetworkConnectionManager* deviceConnMan = (dev ? dev->connectionManager() : NULL); printf("slotActivate\n"); - if (!_dev.isEmpty() && deviceConnMan) + if (!_dev.isEmpty() && nm && deviceConnMan) { + TDENetworkConnection* conn = nm->findConnectionByUUID(_conn); if ( conn ) { kdDebug() << "Activate Connection " << _conn.ascii() << " on Device " << dev->deviceNode().ascii() << endl; @@ -87,7 +85,7 @@ void WirelessNetworkItem::slotActivate() TQString WirelessNetworkItem::getDisplayText() { TDEGlobalNetworkManager* nm = TDEGlobal::networkManager(); - TDENetworkConnection* conn = nm->findConnectionByUUID(_conn); + TDENetworkConnection* conn = (nm ? nm->findConnectionByUUID(_conn) : 0); TQString security = ""; if (((_net.getWpaFlags() & TDENetworkWiFiAPFlags::EncryptionFlagsMask) != TDENetworkWiFiAPFlags::None) && ((_net.getRsnFlags() & TDENetworkWiFiAPFlags::EncryptionFlagsMask) != TDENetworkWiFiAPFlags::None)) { |