From: Maxim Mamontov <faust.madf@gmail.com>
Date: Sat, 28 May 2011 14:32:06 +0000 (+0300)
Subject: Replace fake disconnects with real and fix some errors
X-Git-Tag: 2.408-alpha~123
X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/9725feacf296741ba7c3dfcd4df81e86359f72de?ds=inline

Replace fake disconnects with real and fix some errors
---

diff --git a/projects/stargazer/user_impl.cpp b/projects/stargazer/user_impl.cpp
index 2b64ccc7..e8d326d2 100644
--- a/projects/stargazer/user_impl.cpp
+++ b/projects/stargazer/user_impl.cpp
@@ -1424,10 +1424,12 @@ if (newPassive && !oldPassive && user->tariff != NULL)
 void CHG_TARIFF_NOTIFIER::Notify(const string &, const string & newTariff)
 {
 if (user->settings->GetReconnectOnTariffChange() && user->connected)
-    user->Disconnect(true, "Change tariff");
+    user->Disconnect(false, "Change tariff");
 user->tariff = user->tariffs->FindByName(newTariff);
-if (user->settings->GetReconnectOnTariffChange() && user->IsInetable())
-    user->Connect(true);
+if (user->settings->GetReconnectOnTariffChange() &&
+    !user->authorizedBy.empty() &&
+    user->IsInetable())
+    user->Connect(false);
 }
 //-----------------------------------------------------------------------------
 void CHG_CASH_NOTIFIER::Notify(const double & oldCash, const double & newCash)
@@ -1440,8 +1442,8 @@ void CHG_IPS_NOTIFIER::Notify(const USER_IPS & from, const USER_IPS & to)
 {
     printfd(__FILE__, "Change IP from '%s' to '%s'\n", from.GetIpStr().c_str(), to.GetIpStr().c_str());
     if (user->connected)
-        user->Disconnect(true, "Change IP");
-    if (user->IsInetable())
-        user->Connect(true);
+        user->Disconnect(false, "Change IP");
+    if (!user->authorizedBy.empty() && user->IsInetable())
+        user->Connect(false);
 }
 //-----------------------------------------------------------------------------