summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorAlex Borisov <b0ric.alex@gmail.com>2012-02-05 15:10:57 +0200
committerAlex Borisov <b0ric.alex@gmail.com>2012-02-05 15:10:57 +0200
commitb4caa570592b5b6ddaa10ca529bda3c80476c7fd (patch)
tree52523ea23e0225402eafc32188b0a2cbba98fc57 /client
parentcce3545422b24ea0acda858f28083f0f3f2dd374 (diff)
FIX: static proxy button count and position
Diffstat (limited to 'client')
-rw-r--r--client/Config.cpp2
-rw-r--r--client/Proxifier.cpp2
-rw-r--r--client/Proxifier.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/client/Config.cpp b/client/Config.cpp
index a7d6fc7..8fdd507 100644
--- a/client/Config.cpp
+++ b/client/Config.cpp
@@ -229,7 +229,7 @@ vector<ProxyEntryStatic> Config::GetStaticProxyGuiLine(unsigned line)
vector<ProxyEntryStatic> staticProxyLine;
for (unsigned i = 0; i < staticProxy.size(); i++)
{
- if (staticProxy[i].position != line)
+ if (staticProxy[i].position == line)
staticProxyLine.push_back(staticProxy[i]);
}
diff --git a/client/Proxifier.cpp b/client/Proxifier.cpp
index 4b49c09..6c8acdb 100644
--- a/client/Proxifier.cpp
+++ b/client/Proxifier.cpp
@@ -929,7 +929,7 @@ bool Proxifier::AddChain(string& name, int *id)
return true;
}
-bool Proxifier::AddProxyToChain(int proxyId, int chainId)
+bool Proxifier::AddProxyToChain(int proxyId, int chainId, bool isHttp)
{
Logger::Trace("Adding proxy to chain in Proxifier config\n");
// read XML DOM structure
diff --git a/client/Proxifier.h b/client/Proxifier.h
index 8751ca9..112bc90 100644
--- a/client/Proxifier.h
+++ b/client/Proxifier.h
@@ -223,7 +223,7 @@ private:
* chainId chain ID to add proxy to
* @return true on success or false otherwise
*/
- bool AddProxyToChain(int proxyId, int chainId);
+ bool AddProxyToChain(int proxyId, int chainId, bool isHttp = false);
/**
* @brief remove proxy from proxy chain
* @param proxyId proxy ID to remove to proxy chain