From 6179d22ad50472835266a20b500a5794f3e773c0 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Fri, 19 Jan 2018 22:13:40 +0100
Subject: [PATCH] fixed uninitialized pointer in MainWindow

---
 retroshare-gui/src/gui/MainWindow.cpp | 33 ++++++++++++++++-----------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp
index 61eb6548f..e8b33b1d5 100644
--- a/retroshare-gui/src/gui/MainWindow.cpp
+++ b/retroshare-gui/src/gui/MainWindow.cpp
@@ -247,27 +247,34 @@ MainWindow::MainWindow(QWidget* parent, Qt::WindowFlags flags)
 
 	if(hiddenmode)
 	{
+#ifdef RETROTOR
 		torstatus = new TorStatus();
 		torstatus->setVisible(Settings->valueFromGroup("StatusBar", "ShowTor", QVariant(true)).toBool());
 		statusBar()->addWidget(torstatus);
 		torstatus->getTorStatus();
+#else
+		torstatus = NULL ;
+#endif
+
+		natstatus = NULL ;
+		dhtstatus = NULL ;
 	}
 	else
+	{
 		torstatus = NULL ;
 
-#ifndef RETROTOR
-    natstatus = new NATStatus();
-    if(hiddenmode) natstatus->setVisible(false);
-    else natstatus->setVisible(Settings->valueFromGroup("StatusBar", "ShowNAT", QVariant(true)).toBool());
-    statusBar()->addWidget(natstatus);
-    natstatus->getNATStatus();
-	
-    dhtstatus = new DHTStatus();
-    if(hiddenmode) dhtstatus->setVisible(false);
-    else dhtstatus->setVisible(Settings->valueFromGroup("StatusBar", "ShowDHT", QVariant(true)).toBool());
-    statusBar()->addWidget(dhtstatus);
-    dhtstatus->getDHTStatus();
-#endif
+		natstatus = new NATStatus();
+		if(hiddenmode) natstatus->setVisible(false);
+		else natstatus->setVisible(Settings->valueFromGroup("StatusBar", "ShowNAT", QVariant(true)).toBool());
+		statusBar()->addWidget(natstatus);
+		natstatus->getNATStatus();
+
+		dhtstatus = new DHTStatus();
+		if(hiddenmode) dhtstatus->setVisible(false);
+		else dhtstatus->setVisible(Settings->valueFromGroup("StatusBar", "ShowDHT", QVariant(true)).toBool());
+		statusBar()->addWidget(dhtstatus);
+		dhtstatus->getDHTStatus();
+	}
 	
     hashingstatus = new HashingStatus();
     hashingstatus->setVisible(Settings->valueFromGroup("StatusBar", "ShowHashing", QVariant(true)).toBool());