git.stg.codes
/
stg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1af107f
)
Ticket 26. The 'return -1' removed, 'else' added for the
author
Elena Mamontova
<helenh463@gmail.com>
Fri, 25 Mar 2016 08:28:25 +0000
(10:28 +0200)
committer
Elena Mamontova
<helenh463@gmail.com>
Fri, 25 Mar 2016 08:28:25 +0000
(10:28 +0200)
if(newSettings.ReadSettings()). The settings = newSettings moved to
'else'.
projects/stargazer/main.cpp
patch
|
blob
|
history
diff --git
a/projects/stargazer/main.cpp
b/projects/stargazer/main.cpp
index 34fc4bd00dcd515d51abbf113af422efba003ca5..644fed9145d7a0d43ab27e64d5a9cdd2927bbbd2 100644
(file)
--- 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);
}