From: Maxim Mamontov <faust.madf@gmail.com>
Date: Sat, 20 Aug 2016 10:25:24 +0000 (+0300)
Subject: Merge branch 'stg-2.409'
X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/6a24f530fab7ebff1617f6d3929d2fcad7ed4818?hp=5ac9b6c2949b075cbb8d8c91dd9f603f3f8ad0a3

Merge branch 'stg-2.409'
---

diff --git a/projects/stargazer/user_impl.cpp b/projects/stargazer/user_impl.cpp
index 11f4385b..fe197cc5 100644
--- a/projects/stargazer/user_impl.cpp
+++ b/projects/stargazer/user_impl.cpp
@@ -1563,13 +1563,18 @@ else if (!oldValue && newValue && user->IsInetable())
 //-----------------------------------------------------------------------------
 void CHG_TARIFF_NOTIFIER::Notify(const std::string &, const std::string & newTariff)
 {
+STG_LOCKER lock(&user->mutex);
 if (user->settings->GetReconnectOnTariffChange() && user->connected)
     user->Disconnect(false, "Change tariff");
 user->tariff = user->tariffs->FindByName(newTariff);
 if (user->settings->GetReconnectOnTariffChange() &&
     !user->authorizedBy.empty() &&
     user->IsInetable())
+    {
+    // This notifier gets called *before* changing the tariff, and in Connect we want to see new tariff name.
+    user->property.Conf().tariffName = newTariff;
     user->Connect(false);
+    }
 }
 //-----------------------------------------------------------------------------
 void CHG_CASH_NOTIFIER::Notify(const double & oldCash, const double & newCash)