Correct Socks5 proxy error.

baumgarr · Mar 20, 2017 · 029f7d8 · 029f7d8
1 parent 6c73829
commit 029f7d8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/global.cpp b/global.cpp
@@ -1113,14 +1113,14 @@ bool Global::isProxyEnabled() {
 // Set the Sock5 proxy
 void Global::setSocks5Enabled(bool value) {
     settings->beginGroup("Proxy");
-    settings->setValue("enabled", value);
+    settings->setValue("socks5", value);
     settings->endGroup();
 }
 
 // Get the Socks5 proxy
 bool Global::isSocks5Enabled() {
     settings->beginGroup("Proxy");
-    bool value = settings->value("enabled", false).toBool();
+    bool value = settings->value("socks5", false).toBool();
     settings->endGroup();
     return value;
 }

diff --git a/main.cpp b/main.cpp
@@ -265,11 +265,9 @@ int main(int argc, char *argv[])
 
     // Setup the proxy
     QNetworkProxy proxy;
-    if (global.isSocks5Enabled())
-	proxy.setType(QNetworkProxy::Socks5Proxy);
-    else
-    	proxy.setType(QNetworkProxy::HttpProxy);
     if (global.isProxyEnabled()) {
+        if (global.isSocks5Enabled())
+            proxy.setType(QNetworkProxy::Socks5Proxy);
         QString host = global.getProxyHost();
         int port = global.getProxyPort();
         QString user = global.getProxyUserid();
@@ -285,6 +283,8 @@ int main(int argc, char *argv[])
             proxy.setPassword(password.trimmed());
 
         QNetworkProxy::setApplicationProxy(proxy);
+    } else {
+        proxy.setType(QNetworkProxy::HttpProxy);
     }
 
     QLOG_DEBUG() << "Setting up exit signal";