From: Elena Mamontova <helenh463@gmail.com>
Date: Fri, 25 Mar 2016 08:28:25 +0000 (+0200)
Subject: Ticket 26. The 'return -1' removed, 'else' added for the
X-Git-Tag: 2.409~174^2~1^2~7
X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/2e04025761ba7c7fdd33f81f2b627c4b2ace1ef8

Ticket 26. The 'return -1' removed, 'else' added for the
if(newSettings.ReadSettings()). The settings = newSettings moved to
'else'.
---

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);
             }