Index: sources/device/DeviceController.cpp
===================================================================
diff -u -r3ee91a030e9affe0a50acdee33520c985c05d779 -ra133e7c440fdb6a2f0fbdab6654e733bcfe4f378
--- sources/device/DeviceController.cpp	(.../DeviceController.cpp)	(revision 3ee91a030e9affe0a50acdee33520c985c05d779)
+++ sources/device/DeviceController.cpp	(.../DeviceController.cpp)	(revision a133e7c440fdb6a2f0fbdab6654e733bcfe4f378)
@@ -253,30 +253,28 @@
  */
 void DeviceController::checkWiFi()
 {
-    if ( ! _wifiAvailable) {
-        emit didWiFiData(tr("WiFi Connection Error"));
-        return;
-    }
+    QString mInfo;
+    QNetworkInterface dev;
+    QList<QNetworkAddressEntry> addresses;
 
-    const QNetworkInterface dev = QNetworkInterface::interfaceFromName("wlan0");
-    if ( ! dev.isValid() ) {
-        emit didWiFiData(tr("No WiFi"));
-        return;
-    }
+    mInfo = tr("WiFi Connection Error");
+    if ( ! _wifiAvailable )     { goto lOut; }
 
-    QList<QNetworkAddressEntry> addresses = dev.addressEntries();
-    if ( addresses.isEmpty() ) {
-        emit didWiFiData(tr("WiFi Not Connected"));
-        return;
-    }
+    mInfo = tr("No WiFi");
+    dev = QNetworkInterface::interfaceFromName(_interface);
+    if ( ! dev.isValid() )      { goto lOut; }
 
-    if ( ! (dev.flags().testFlag(QNetworkInterface::IsUp) &&
-            dev.flags().testFlag(QNetworkInterface::IsRunning))) {
-        emit didWiFiData(tr("WiFi Not Connected"));
-        return;
-    }
+    addresses = dev.addressEntries();
+    mInfo = tr("WiFi Not Connected");
+    if ( addresses.isEmpty() )  { goto lOut; }
 
-    emit didWiFiData(addresses.first().ip().toString());
+    if ( ! ( dev.flags().testFlag(QNetworkInterface::IsUp) &&
+             dev.flags().testFlag(QNetworkInterface::IsRunning) ) ) { goto lOut; }
+
+    mInfo = addresses.first().ip().toString();
+
+lOut:
+    emit didWiFiData(mInfo);
 }
 
 /*!