From a6c5a90630428689deeeccd45bec3b3acb89ff94 Mon Sep 17 00:00:00 2001
From: Chocobo1 <Chocobo1@users.noreply.github.com>
Date: Sun, 16 Jun 2019 17:50:55 +0800
Subject: [PATCH] Remove redundant variable

---
 src/base/bittorrent/session.cpp | 67 +++++++++++++++++----------------
 src/base/bittorrent/session.h   |  1 -
 2 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/src/base/bittorrent/session.cpp b/src/base/bittorrent/session.cpp
index 2cc9ad11b..75253f7b0 100644
--- a/src/base/bittorrent/session.cpp
+++ b/src/base/bittorrent/session.cpp
@@ -362,7 +362,6 @@ Session::Session(QObject *parent)
     , m_wasPexEnabled(m_isPeXEnabled)
     , m_numResumeData(0)
     , m_extraLimit(0)
-    , m_useProxy(false)
     , m_recentErroredTorrentsTimer(new QTimer(this))
 {
     Logger *const logger = Logger::instance();
@@ -1211,42 +1210,44 @@ void Session::configure(lt::settings_pack &settingsPack)
         settingsPack.set_int(lt::settings_pack::in_enc_policy, lt::settings_pack::pe_disabled);
     }
 
+    // proxy
     const auto proxyManager = Net::ProxyConfigurationManager::instance();
     const Net::ProxyConfiguration proxyConfig = proxyManager->proxyConfiguration();
-    if (m_useProxy || (proxyConfig.type != Net::ProxyType::None)) {
-        if (proxyConfig.type != Net::ProxyType::None) {
-            settingsPack.set_str(lt::settings_pack::proxy_hostname, proxyConfig.ip.toStdString());
-            settingsPack.set_int(lt::settings_pack::proxy_port, proxyConfig.port);
-            if (proxyManager->isAuthenticationRequired()) {
-                settingsPack.set_str(lt::settings_pack::proxy_username, proxyConfig.username.toStdString());
-                settingsPack.set_str(lt::settings_pack::proxy_password, proxyConfig.password.toStdString());
-            }
-            settingsPack.set_bool(lt::settings_pack::proxy_peer_connections, isProxyPeerConnectionsEnabled());
-        }
 
-        switch (proxyConfig.type) {
-        case Net::ProxyType::HTTP:
-            settingsPack.set_int(lt::settings_pack::proxy_type, lt::settings_pack::http);
-            break;
-        case Net::ProxyType::HTTP_PW:
-            settingsPack.set_int(lt::settings_pack::proxy_type, lt::settings_pack::http_pw);
-            break;
-        case Net::ProxyType::SOCKS4:
-            settingsPack.set_int(lt::settings_pack::proxy_type, lt::settings_pack::socks4);
-            break;
-        case Net::ProxyType::SOCKS5:
-            settingsPack.set_int(lt::settings_pack::proxy_type, lt::settings_pack::socks5);
-            break;
-        case Net::ProxyType::SOCKS5_PW:
-            settingsPack.set_int(lt::settings_pack::proxy_type, lt::settings_pack::socks5_pw);
-            break;
-        default:
-            settingsPack.set_int(lt::settings_pack::proxy_type, lt::settings_pack::none);
-        }
-
-        m_useProxy = (proxyConfig.type != Net::ProxyType::None);
+    switch (proxyConfig.type) {
+    case Net::ProxyType::HTTP:
+        settingsPack.set_int(lt::settings_pack::proxy_type, lt::settings_pack::http);
+        break;
+    case Net::ProxyType::HTTP_PW:
+        settingsPack.set_int(lt::settings_pack::proxy_type, lt::settings_pack::http_pw);
+        break;
+    case Net::ProxyType::SOCKS4:
+        settingsPack.set_int(lt::settings_pack::proxy_type, lt::settings_pack::socks4);
+        break;
+    case Net::ProxyType::SOCKS5:
+        settingsPack.set_int(lt::settings_pack::proxy_type, lt::settings_pack::socks5);
+        break;
+    case Net::ProxyType::SOCKS5_PW:
+        settingsPack.set_int(lt::settings_pack::proxy_type, lt::settings_pack::socks5_pw);
+        break;
+    case Net::ProxyType::None:
+    default:
+        settingsPack.set_int(lt::settings_pack::proxy_type, lt::settings_pack::none);
     }
-    settingsPack.set_bool(lt::settings_pack::force_proxy, m_useProxy ? isForceProxyEnabled() : false);
+
+    if (proxyConfig.type != Net::ProxyType::None) {
+        settingsPack.set_str(lt::settings_pack::proxy_hostname, proxyConfig.ip.toStdString());
+        settingsPack.set_int(lt::settings_pack::proxy_port, proxyConfig.port);
+
+        if (proxyManager->isAuthenticationRequired()) {
+            settingsPack.set_str(lt::settings_pack::proxy_username, proxyConfig.username.toStdString());
+            settingsPack.set_str(lt::settings_pack::proxy_password, proxyConfig.password.toStdString());
+        }
+
+        settingsPack.set_bool(lt::settings_pack::proxy_peer_connections, isProxyPeerConnectionsEnabled());
+    }
+    settingsPack.set_bool(lt::settings_pack::force_proxy
+        , ((proxyConfig.type == Net::ProxyType::None) ? false : isForceProxyEnabled()));
 
     settingsPack.set_bool(lt::settings_pack::announce_to_all_trackers, announceToAllTrackers());
     settingsPack.set_bool(lt::settings_pack::announce_to_all_tiers, announceToAllTiers());
diff --git a/src/base/bittorrent/session.h b/src/base/bittorrent/session.h
index 16125f73e..6dfdaacc9 100644
--- a/src/base/bittorrent/session.h
+++ b/src/base/bittorrent/session.h
@@ -671,7 +671,6 @@ namespace BitTorrent
         QVector<BitTorrent::TrackerEntry> m_additionalTrackerList;
         QString m_resumeFolderPath;
         QFile m_resumeFolderLock;
-        bool m_useProxy;
 
         QTimer *m_refreshTimer;
         QTimer *m_seedingLimitTimer;