Fix default device handling and clean up code

1 files changed, 14 insertions, 3 deletions

diff --git a/tdenetworkmanager/src/main.cpp b/tdenetworkmanager/src/main.cpp
index f8c86cb..02cd662 100644
--- a/tdenetworkmanager/src/main.cpp
+++ b/tdenetworkmanager/src/main.cpp
@@ -23,6 +23,7 @@
  **************************************************************************/
 
 // TDE includes
+#include <kglobal.h>
 #include <kaboutdata.h>
 #include <kcmdlineargs.h>
 #include <dcopclient.h>
@@ -56,10 +57,20 @@ kdemain (int argc, char* argv[])
 
 	KCmdLineArgs::init (argc, argv, &aboutData);
 
-	if (TDENetworkManager::start ()) {
+	if (TDENetworkManager::start()) {
 		TDENetworkManager app;
-		app.disableSessionManagement ();
-		return app.exec ();
+		app.disableSessionManagement();
+
+		if (!KGlobal::hardwareDevices()) {
+			printf("[ERROR] Unable to load tdenetworkmanager due to invalid KGlobal::hardwareDevices() object\n\r"); fflush(stdout);
+			return -1;
+		}
+		if (!KGlobal::networkManager()) {
+			printf("[ERROR] Unable to load tdenetworkmanager due to invalid KGlobal::hardwareDevices() object\n\r"); fflush(stdout);
+			return -1;
+		}
+
+		return app.exec();
 	}
 	return 0;
 }