1 files changed, 12 insertions, 5 deletions

diff --git a/noncore/settings/networksettings/wlan/wlanmodule.cpp b/noncore/settings/networksettings/wlan/wlanmodule.cpp
index 371b689..7bded85 100644
--- a/noncore/settings/networksettings/wlan/wlanmodule.cpp
+++ b/noncore/settings/networksettings/wlan/wlanmodule.cpp
@@ -71,5 +71,5 @@ bool WLANModule::isOwner(Interface *i){
  */
 QWidget *WLANModule::configure(Interface *i){
-  WLANImp *wlanconfig = new WLANImp(0, "WlanConfig", i, false,  Qt::WDestructiveClose);
+  WLANImp *wlanconfig = new WLANImp(0, "WlanConfig", i, true,  Qt::WDestructiveClose);
   wlanconfig->setProfile(profile);
   return wlanconfig;
@@ -133,4 +133,5 @@ void WLANModule::receive(const QCString &param, const QByteArray &arg)
     QString interface;
     QString action;
+    QDialog *toShow;
     while (! stream.atEnd() ){
         stream >> interface;
@@ -148,6 +149,6 @@ void WLANModule::receive(const QCString &param, const QByteArray &arg)
         if (ifa == 0){
             qDebug("WLANModule Did not find %s",interface.latin1());
-            qDebug("returning");
-            return;
+            qDebug("skipping");
+            count = 0;
         }
 
@@ -171,4 +172,5 @@ void WLANModule::receive(const QCString &param, const QByteArray &arg)
                 //FIXME: what if it got closed meanwhile?
                 wlanconfigWiget = (WLANImp*) configure(ifa);
+                toShow = (QDialog*) wlanconfigWiget;
             }
             wlanconfigWiget->showMaximized();
@@ -192,6 +194,10 @@ void WLANModule::receive(const QCString &param, const QByteArray &arg)
 
             }else if (action.contains("Channel")){
-                wlanconfigWiget->specifyChan->setChecked( true );
-                wlanconfigWiget->networkChannel->setValue( value.toInt() );
+                bool ok;
+                int chan = value.toInt( &ok );
+                if (ok){
+                    wlanconfigWiget->specifyChan->setChecked( true );
+                    wlanconfigWiget->networkChannel->setValue( chan );
+                }
             }else if (action.contains("MacAddr")){
                 wlanconfigWiget->specifyAp->setChecked( true );
@@ -201,4 +207,5 @@ void WLANModule::receive(const QCString &param, const QByteArray &arg)
         }
     }// while stream
+    if (toShow) toShow->exec();
 }