From 2e04025761ba7c7fdd33f81f2b627c4b2ace1ef8 Mon Sep 17 00:00:00 2001
From: Elena Mamontova <helenh463@gmail.com>
Date: Fri, 25 Mar 2016 10:28:25 +0200
Subject: [PATCH] Ticket 26. The 'return -1' removed, 'else' added for the
if(newSettings.ReadSettings()). The settings = newSettings moved to 'else'.
---
projects/stargazer/main.cpp | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/projects/stargazer/main.cpp b/projects/stargazer/main.cpp
index 34fc4bd0..644fed91 100644
--- a/projects/stargazer/main.cpp
+++ b/projects/stargazer/main.cpp
@@ -348,9 +348,11 @@ while (running)
WriteServLog.SetLogFileName(newSettings.GetLogFileName());
WriteServLog("ReadSettings error. %s", newSettings.GetStrError().c_str());
- return -1;
}
- settings = newSettings;
+ else
+ {
+ settings = newSettings;
+ }
traffCnt.Reload();
manager.reload(settings);
}
--
2.44.2