From e23f72738a41ada892e8979aaa9cea318e9d941a Mon Sep 17 00:00:00 2001
From: Alex Borisov <b0ris@b0ris-satellite.localdomain>
Date: Sat, 7 Jan 2012 04:45:01 +0200
Subject: FIX turn off generic proxies correctly

---
 client/Dialog.cpp | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'client/Dialog.cpp')

diff --git a/client/Dialog.cpp b/client/Dialog.cpp
index 6df4ceb..b08213a 100644
--- a/client/Dialog.cpp
+++ b/client/Dialog.cpp
@@ -138,12 +138,18 @@ void ProxyDialog::ProxyToggled(bool on)
 	}
 	if (on)
 	{
+		vector<Proxy> active = proxifier->GetActiveProxies();
+		for (unsigned i = 0; i < active.size(); i++)
+		{
+			ProxyEntryGeneric* genProxy = cfg->GetGenericProxy(active[i].host, active[i].port);
+			if (genProxy == NULL)
+			{
+				continue;
+			}
+			proxifier->TurnProxyOff(*genProxy);
+		}
 		proxifier->TurnProxyOn(*proxy);
 	}
-	else
-	{
-		proxifier->TurnProxyOff(*proxy);
-	}
 }
 
 void ProxyDialog::StaticProxyToggled(bool on)
-- 
cgit v1.2.3