From: Elena Mamontova Date: Thu, 19 Jan 2017 14:46:41 +0000 (+0200) Subject: Ticket 37. The construction if-else removed and ReadString() changed to X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/4992116f3692efc5c4b7839849607c3b50b0b281?ds=sidebyside Ticket 37. The construction if-else removed and ReadString() changed to ReadTime() for the ChangedPolicyTimeout in the RestoreTariff(). --- diff --git a/projects/stargazer/plugins/store/files/file_store.cpp b/projects/stargazer/plugins/store/files/file_store.cpp index 098f59b4..6f316072 100644 --- a/projects/stargazer/plugins/store/files/file_store.cpp +++ b/projects/stargazer/plugins/store/files/file_store.cpp @@ -1471,16 +1471,7 @@ if (conf.ReadString("ChangePolicy", &str, "allow") < 0) else td->tariffConf.changePolicy = TARIFF::StringToChangePolicy(str); -if (conf.ReadString("ChangePolicyTimeout", &str, "0") < 0) -{ - td->tariffConf.changePolicyTimeout = 0; -} -else -{ - int64_t policyTime = 0; - if (str2x(str, policyTime) == 0) - td->tariffConf.changePolicyTimeout = (time_t)policyTime; -} +conf.ReadTime("ChangePolicyTimeout", &td->tariffConf.changePolicyTimeout, 0); return 0; } //-----------------------------------------------------------------------------