[PC-BSD Commits] r19223 - pcbsd/current/src-qt4/pc-netmanager/src/wificonfig

[svn at pcbsd.org]

Author: kris
Date: 2012-09-17 14:29:27 +0000 (Mon, 17 Sep 2012)
New Revision: 19223

Modified:
   pcbsd/current/src-qt4/pc-netmanager/src/wificonfig/wificonfigwidgetbase.cpp
Log:

Fix the wifi util to display that the interface is disabled, if no entry is in
rc.conf



Modified: pcbsd/current/src-qt4/pc-netmanager/src/wificonfig/wificonfigwidgetbase.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-netmanager/src/wificonfig/wificonfigwidgetbase.cpp	2012-09-17 14:21:03 UTC (rev 19222)
+++ pcbsd/current/src-qt4/pc-netmanager/src/wificonfig/wificonfigwidgetbase.cpp	2012-09-17 14:29:27 UTC (rev 19223)
@@ -1106,12 +1106,9 @@
    else
      tmp = Utils::getConfFileValue( "/etc/rc.conf", "ifconfig_" + DeviceName + "=", 1 );
 
-   if ( ! tmp.isEmpty() )  {
-   // If the device is setup, start loading the settings
-
-   if ( tmp.indexOf("OFF") != -1 ) {
-	   checkDisableWireless->setChecked(TRUE);
-	   tabMainWidget->setEnabled(FALSE);
+   if ( tmp.isEmpty() || tmp.indexOf("OFF") != -1 )  {
+      checkDisableWireless->setChecked(TRUE);
+      tabMainWidget->setEnabled(FALSE);
    } else if ( tmp.indexOf("DHCP") != -1 ) {
       checkDHCP->setChecked(TRUE);
       lineNetmask->setText("255.255.255.0");
@@ -1161,10 +1158,9 @@
              // No netmask specified, default it instead
              lineNetmask->setText("255.255.255.0");
           }
-        }
-     }
+      }
+   }
    
-   }
 
    // Look for the wpa_supplicant.conf file
    QFile file( "/etc/wpa_supplicant.conf" );