From: Elena Mamontova Date: Mon, 8 Aug 2016 10:37:07 +0000 (+0300) Subject: Ticket 37. The message variable definition moved from if() construction X-Git-Tag: 2.409~126 X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/489de0deb4c1182cfbce41809b17892fcf9430fd?hp=0bccec4ece837941fd6ff445bbfceb62be928788 Ticket 37. The message variable definition moved from if() construction in the ApplyChanges() function. --- diff --git a/projects/stargazer/plugins/configuration/sgconfig/parser_users.cpp b/projects/stargazer/plugins/configuration/sgconfig/parser_users.cpp index 841fafa1..ef3a470e 100644 --- a/projects/stargazer/plugins/configuration/sgconfig/parser_users.cpp +++ b/projects/stargazer/plugins/configuration/sgconfig/parser_users.cpp @@ -598,7 +598,8 @@ int CHG_USER::ApplyChanges() if (newTariff) { const TARIFF * tariff = u->GetTariff(); - if (tariff->TariffChangeIsAllowed(*newTariff) == "") + std::string message = tariff->TariffChangeIsAllowed(*newTariff); + if (message == "") { if (!u->GetProperty().tariffName.Set(m_ucr.tariffName.const_data(), &m_currAdmin, m_login, &m_store)) return -1; @@ -606,7 +607,6 @@ int CHG_USER::ApplyChanges() } else { - std::string message = tariff->TariffChangeIsAllowed(*newTariff); GetStgLogger()("Tariff change is prohibited for user %s. %s", u->GetLogin().c_str(), message.c_str()); } }