From a81cf1ea16e0d4a148830594d0501761a24a0649 Mon Sep 17 00:00:00 2001
From: Chocobo1 <Chocobo1@users.noreply.github.com>
Date: Sun, 8 May 2016 20:45:53 +0800
Subject: [PATCH] Fix "IP Filtering - Apply to trackers" wasn't being applied.
 Closes #5217.

---
 src/base/bittorrent/session.cpp | 2 ++
 src/gui/options_imp.cpp         | 7 +++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/base/bittorrent/session.cpp b/src/base/bittorrent/session.cpp
index b1a608a33..35638d8fe 100644
--- a/src/base/bittorrent/session.cpp
+++ b/src/base/bittorrent/session.cpp
@@ -675,6 +675,8 @@ void Session::setSessionSettings()
         sessionSettings.force_proxy = false;
     sessionSettings.no_connect_privileged_ports = false;
     sessionSettings.seed_choking_algorithm = libt::session_settings::fastest_upload;
+
+    sessionSettings.apply_ip_filter_to_trackers = pref->isFilteringTrackerEnabled();
     qDebug() << "Set session settings";
     m_nativeSession->set_settings(sessionSettings);
 }
diff --git a/src/gui/options_imp.cpp b/src/gui/options_imp.cpp
index 4e94b79ea..74d3927cc 100644
--- a/src/gui/options_imp.cpp
+++ b/src/gui/options_imp.cpp
@@ -545,13 +545,12 @@ void options_imp::saveOptions()
     pref->setGlobalMaxRatio(getMaxRatio());
     session->setMaxRatioAction(static_cast<MaxRatioAction>(comboRatioLimitAct->currentIndex()));
     // End Bittorrent preferences
+
     // Misc preferences
     // * IPFilter
     pref->setFilteringEnabled(isFilteringEnabled());
-    if (isFilteringEnabled()) {
-        pref->setFilteringTrackerEnabled(checkIpFilterTrackers->isChecked());
-        pref->setFilter(textFilterPath->text());
-    }
+    pref->setFilteringTrackerEnabled(checkIpFilterTrackers->isChecked());
+    pref->setFilter(textFilterPath->text());
     // End IPFilter preferences
     // Queueing system
     pref->setQueueingSystemEnabled(isQueueingSystemEnabled());