merge cleanup branch

1 files changed, 5 insertions, 4 deletions

diff --git a/src/fbgui/networkdiscovery.cpp b/src/fbgui/networkdiscovery.cpp
index 49aa148..ccefb8a 100644
--- a/src/fbgui/networkdiscovery.cpp
+++ b/src/fbgui/networkdiscovery.cpp
@@ -544,7 +544,7 @@ bool NetworkDiscovery::checkConnectivityViaTcp(QString server) {
 /**
  * same function as handleNewInput() but with a client as parameter.
  *
- * @param 	cleint
+ * @param 	client
  * 			a client
  */
 void NetworkDiscovery::handleNewInput(QLocalSocket * client) {
@@ -553,7 +553,7 @@ void NetworkDiscovery::handleNewInput(QLocalSocket * client) {
 		QString data(client->readLine());
 
 		data = data.trimmed();
-		LOG4CXX_DEBUG(ndcLogger, data);
+		if (!data.isEmpty()) LOG4CXX_DEBUG(ndcLogger, data);
 		QStringList lines = data.split("\n");
 
 		for (int i = 0; i < lines.length(); i++) {
@@ -621,6 +621,7 @@ void NetworkDiscovery::handleNewInputLine(QLocalSocket * client, QString logMsg)
       _ifNameToClient.insert(interface, client);
     }
 
+
   // st states
 
   //      #define LOG_EMERG       0       /* system is unusable */
@@ -856,8 +857,8 @@ void NetworkDiscovery::prepareTryAgain() {
 	 }
 	 */
 	// reset everything
-	delete _networkManager;
-	delete _server;
+	//delete _networkManager;
+	//delete _server;
 	foreach(QProcess* p, _clientProcessToIfNameMap.keys())
 	{
 		delete p;