1 files changed, 4 insertions, 13 deletions

diff --git a/libopie2/opienet/omanufacturerdb.cpp b/libopie2/opienet/omanufacturerdb.cpp
index 123aee8..3af3d4c 100644
--- a/libopie2/opienet/omanufacturerdb.cpp
+++ b/libopie2/opienet/omanufacturerdb.cpp
@@ -30,4 +30,2 @@
 
-#define OPIE_IMPROVE_GUI_LATENCY 1
-
 /* OPIE */
@@ -65,5 +63,3 @@ OManufacturerDB::OManufacturerDB()
 {
-    #ifdef OPIE_IMPROVE_GUI_LATENCY
-    Global::statusMessage( "Reading Manufacturers..." );
-    #endif
+    if ( qApp ) Global::statusMessage( "Reading Manufacturers..." );
     QString filename( "/etc/manufacturers" );
@@ -94,5 +90,4 @@ OManufacturerDB::OManufacturerDB()
         QString extManu;
-        #ifdef OPIE_IMPROVE_GUI_LATENCY
         int counter = 0;
-        #endif
+
         while (!s.atEnd())
@@ -106,3 +101,2 @@ OManufacturerDB::OManufacturerDB()
             // odebug << "OmanufacturerDB: parse '" << addr << "' as '" << manu << "' (" << extManu << ")" << oendl;
-            #ifdef OPIE_IMPROVE_GUI_LATENCY
             counter++;
@@ -110,11 +104,8 @@ OManufacturerDB::OManufacturerDB()
             {
-                qApp->processEvents();
+                if ( qApp ) qApp->processEvents();
                 counter = 0;
             }
-            #endif
         }
         odebug << "OManufacturerDB: manufacturer list completed." << oendl;
-        #ifdef OPIE_IMPROVE_GUI_LATENCY
-        Global::statusMessage( "Manufacturers Complete..." );
-        #endif
+        if ( qApp ) Global::statusMessage( "Manufacturers Complete..." );
     }