]> git.stg.codes - stg.git/blobdiff - projects/stargazer/tariff_impl.cpp
Merge remote-tracking branch 'origin/master' into ticket
[stg.git] / projects / stargazer / tariff_impl.cpp
index 2daaeeb3756c6bc8f8e7da3dc19bf22a78444efa..7dbae0da5def9330a4a6d01a957cf72b208d36e3 100644 (file)
@@ -148,7 +148,7 @@ else
 std::string TARIFF_IMPL::TariffChangeIsAllowed(const TARIFF & to, time_t currentTime) const
 {
 time_t timeout = GetChangePolicyTimeout();
-if ((currentTime > timeout) && (timeout != 0))
+if (currentTime > timeout && timeout != 0)
     return "";
 switch (GetChangePolicy())
     {
@@ -167,5 +167,6 @@ switch (GetChangePolicy())
     case TARIFF::DENY:
         return "Current tariff '" + GetName() + "', new tariff '" + to.GetName() + "'. The policy is '" + TARIFF::ChangePolicyToString(GetChangePolicy()) + "'.";
     }
+return "";
 }
 //-----------------------------------------------------------------------------