Merge pull request #5230 from Chocobo1/filterTracker

Fix "IP Filtering - Apply to trackers" wasn't being applied
This commit is contained in:
sledgehammer999 2016-05-08 09:16:40 -05:00
commit fecf8501cb
2 changed files with 5 additions and 4 deletions

View File

@ -675,6 +675,8 @@ void Session::setSessionSettings()
sessionSettings.force_proxy = false; sessionSettings.force_proxy = false;
sessionSettings.no_connect_privileged_ports = false; sessionSettings.no_connect_privileged_ports = false;
sessionSettings.seed_choking_algorithm = libt::session_settings::fastest_upload; sessionSettings.seed_choking_algorithm = libt::session_settings::fastest_upload;
sessionSettings.apply_ip_filter_to_trackers = pref->isFilteringTrackerEnabled();
qDebug() << "Set session settings"; qDebug() << "Set session settings";
m_nativeSession->set_settings(sessionSettings); m_nativeSession->set_settings(sessionSettings);
} }

View File

@ -545,13 +545,12 @@ void options_imp::saveOptions()
pref->setGlobalMaxRatio(getMaxRatio()); pref->setGlobalMaxRatio(getMaxRatio());
session->setMaxRatioAction(static_cast<MaxRatioAction>(comboRatioLimitAct->currentIndex())); session->setMaxRatioAction(static_cast<MaxRatioAction>(comboRatioLimitAct->currentIndex()));
// End Bittorrent preferences // End Bittorrent preferences
// Misc preferences // Misc preferences
// * IPFilter // * IPFilter
pref->setFilteringEnabled(isFilteringEnabled()); pref->setFilteringEnabled(isFilteringEnabled());
if (isFilteringEnabled()) {
pref->setFilteringTrackerEnabled(checkIpFilterTrackers->isChecked()); pref->setFilteringTrackerEnabled(checkIpFilterTrackers->isChecked());
pref->setFilter(textFilterPath->text()); pref->setFilter(textFilterPath->text());
}
// End IPFilter preferences // End IPFilter preferences
// Queueing system // Queueing system
pref->setQueueingSystemEnabled(isQueueingSystemEnabled()); pref->setQueueingSystemEnabled(isQueueingSystemEnabled());