Fixed damn bug causing wirelessapplet to hang Opie if /proc/net/wireless is not found (i.e. SHARP ROM or Desktop PC)

1 files changed, 14 insertions, 10 deletions

diff --git a/noncore/applets/wirelessapplet/networkinfo.cpp b/noncore/applets/wirelessapplet/networkinfo.cpp
index dc5c3be..22d7d83 100644
--- a/noncore/applets/wirelessapplet/networkinfo.cpp
+++ b/noncore/applets/wirelessapplet/networkinfo.cpp
@@ -173,10 +173,12 @@ void MWirelessNetworkInterface::updateStatistics()
     QString name;
     QFile wfile( PROCNETWIRELESS );
-    wfile.open( IO_ReadOnly );
+    bool hasFile = wfile.open( IO_ReadOnly );
     QTextStream wstream( &wfile );
+    if ( hasFile )
+    {
     wstream.readLine();  // skip the first two lines
     wstream.readLine();  // because they only contain headers
-
-    if ( wstream.atEnd() )
+    }
+    if ( ( !hasFile ) || ( wstream.atEnd() ) )
     {
         qDebug( "WIFIAPPLET: D'oh! Someone removed the card..." );
@@ -203,11 +205,11 @@ void MWirelessNetworkInterface::updateStatistics()
 MNetwork::MNetwork()
 {
-    qDebug( "MNetwork::MNetwork()" );
-    procfile = "/proc/net/dev";
+    //qDebug( "MNetwork::MNetwork()" );
+    procfile = PROCNETDEV;
 }
 
 MNetwork::~MNetwork()
 {
-    qDebug( "MNetwork::~MNetwork()" );
+    //qDebug( "MNetwork::~MNetwork()" );
 }
 
@@ -218,11 +220,11 @@ MNetwork::~MNetwork()
 MWirelessNetwork::MWirelessNetwork()
 {
-    qDebug( "MWirelessNetwork::MWirelessNetwork()" );
-    procfile = "/proc/net/wireless";
+    //qDebug( "MWirelessNetwork::MWirelessNetwork()" );
+    procfile = PROCNETWIRELESS;
 }
 
 MWirelessNetwork::~MWirelessNetwork()
 {
-    qDebug( "MWirelessNetwork::~MWirelessNetwork()" );
+    //qDebug( "MWirelessNetwork::~MWirelessNetwork()" );
 }
 
@@ -248,5 +250,7 @@ void MNetwork::enumerateInterfaces()
     QString str;
     QFile f( procfile );
-    f.open( IO_ReadOnly );
+    bool hasFile = f.open( IO_ReadOnly );
+    if ( !hasFile )
+        return;
     QTextStream s( &f );
     s.readLine();