1 files changed, 3 insertions, 3 deletions

diff --git a/noncore/settings/networksettings/wlan/wextensions.cpp b/noncore/settings/networksettings/wlan/wextensions.cpp
index e545bd1..eb6fc42 100644
--- a/noncore/settings/networksettings/wlan/wextensions.cpp
+++ b/noncore/settings/networksettings/wlan/wextensions.cpp
@@ -1,87 +1,87 @@
 #include "wextensions.h"
 
 #include <qfile.h>
 #include <qtextstream.h>
 
 #include <arpa/inet.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 
 #include <math.h>
 
 #define PROCNETWIRELESS "/proc/net/wireless"
 #define IW_LOWER 0
 #define IW_UPPER 256
 
 /**
  * Constructor.  Sets hasWirelessExtensions
  */ 
-WExtensions::WExtensions(QString interfaceName){
+WExtensions::WExtensions(QString interfaceName): hasWirelessExtensions(false){
   interface = interfaceName;
   fd = socket( AF_INET, SOCK_DGRAM, 0 );
+  if(fd == -1) 
+    return;
 
   const char* buffer[200];
   memset( &iwr, 0, sizeof( iwr ) );
   iwr.u.essid.pointer = (caddr_t) buffer;
   iwr.u.essid.length = IW_ESSID_MAX_SIZE;
   iwr.u.essid.flags = 0;
   
   // check if it is an IEEE 802.11 standard conform
   // wireless device by sending SIOCGIWESSID
   // which also gives back the Extended Service Set ID
   // (see IEEE 802.11 for more information)
 
   const char* iname = interface.latin1();
   strcpy( iwr.ifr_ifrn.ifrn_name,  (const char *)iname );
   if ( 0 == ioctl( fd, SIOCGIWESSID, &iwr ) )
     hasWirelessExtensions = true;
-  else
-    hasWirelessExtensions = false;
 }
 
 /**
  * @return QString the station name of the access point.
  */ 
 QString WExtensions::station(){
   if(!hasWirelessExtensions)
     return QString();
   const char* buffer[200];
   iwr.u.data.pointer = (caddr_t) buffer;
   iwr.u.data.length = IW_ESSID_MAX_SIZE;
   iwr.u.data.flags = 0;
   if ( 0 == ioctl( fd, SIOCGIWNICKN, &iwr )){
     iwr.u.data.pointer[(unsigned int) iwr.u.data.length-1] = '\0';
     return QString(iwr.u.data.pointer);
   }
   return QString();
 }
 
 /**
  * @return QString the essid of the host 802.11 access point.
  */ 
 QString WExtensions::essid(){
   if(!hasWirelessExtensions)
     return QString();
   if ( 0 == ioctl( fd, SIOCGIWESSID, &iwr )){
     iwr.u.essid.pointer[(unsigned int) iwr.u.essid.length-1] = '\0';
     return QString(iwr.u.essid.pointer);
   }
   return QString();
 }
 
 /**
  * @return QString the mode of interface
  */ 
 QString WExtensions::mode(){
   if(!hasWirelessExtensions)
     return QString();
   if ( 0 == ioctl( fd, SIOCGIWMODE, &iwr ) )
     return QString("%1").arg(iwr.u.mode == IW_MODE_ADHOC ? "Ad-Hoc" : "Managed");
   return QString();
 }
 
 /**
  * Get the frequency that the interface is running at.
  * @return int the frequency that the interfacae is running at.
  */ 
 double WExtensions::frequency(){