X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/477aa660aac26aeb8dfede1e439f023dbaba41c9..6a24f530fab7ebff1617f6d3929d2fcad7ed4818:/projects/stargazer/user_impl.cpp

diff --git a/projects/stargazer/user_impl.cpp b/projects/stargazer/user_impl.cpp
index 51f49ff1..fe197cc5 100644
--- a/projects/stargazer/user_impl.cpp
+++ b/projects/stargazer/user_impl.cpp
@@ -557,6 +557,8 @@ if (authorizedBy.empty())
     lastDisconnectReason = reason;
     lastIPForDisconnect = currIP;
     currIP = 0; // DelUser in traffcounter
+    if (connected)
+        Disconnect(false, "not authorized");
     return;
     }
 }
@@ -1352,7 +1354,7 @@ for (size_t i = 0; i < property.Conf().services.size(); ++i)
     if (m_services.Find(property.Conf().services[i], &conf))
         continue;
     if (conf.payDay == tms.tm_mday ||
-        conf.payDay == 0 && tms.tm_mday == DaysInCurrentMonth())
+        (conf.payDay == 0 && tms.tm_mday == DaysInCurrentMonth()))
         {
         double c = cash;
         double fee = conf.cost * passiveTimePart;
@@ -1561,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)