Browse Source

Remove artificial max limits from "Torrent Queueing" related options

Closes #16936.

PR #16942.
adaptive-webui-19844
Chocobo1 3 years ago committed by GitHub
parent
commit
19cbffb5e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 17
      src/base/bittorrent/session.cpp
  2. 15
      src/gui/optionsdialog.ui

17
src/base/bittorrent/session.cpp

@ -1191,13 +1191,18 @@ void Session::processBannedIPs(lt::ip_filter &filter) @@ -1191,13 +1191,18 @@ void Session::processBannedIPs(lt::ip_filter &filter)
void Session::adjustLimits(lt::settings_pack &settingsPack) const
{
// Internally increase the queue limits to ensure that the magnet is started
const int maxDownloads = maxActiveDownloads();
const int maxActive = maxActiveTorrents();
const auto adjustLimit = [this](const int limit) -> int
{
if (limit <= -1)
return limit;
// check for overflow: (limit + m_extraLimit) < std::numeric_limits<int>::max()
return (m_extraLimit < (std::numeric_limits<int>::max() - limit))
? (limit + m_extraLimit)
: std::numeric_limits<int>::max();
};
settingsPack.set_int(lt::settings_pack::active_downloads
, maxDownloads > -1 ? maxDownloads + m_extraLimit : maxDownloads);
settingsPack.set_int(lt::settings_pack::active_limit
, maxActive > -1 ? maxActive + m_extraLimit : maxActive);
settingsPack.set_int(lt::settings_pack::active_downloads, adjustLimit(maxActiveDownloads()));
settingsPack.set_int(lt::settings_pack::active_limit, adjustLimit(maxActiveTorrents()));
}
void Session::applyBandwidthLimits(lt::settings_pack &settingsPack) const

15
src/gui/optionsdialog.ui

@ -2442,10 +2442,7 @@ Disable encryption: Only connect to peers without protocol encryption</string> @@ -2442,10 +2442,7 @@ Disable encryption: Only connect to peers without protocol encryption</string>
<number>-1</number>
</property>
<property name="maximum">
<number>999</number>
</property>
<property name="value">
<number>3</number>
<number>2147483647</number>
</property>
</widget>
</item>
@ -2465,10 +2462,7 @@ Disable encryption: Only connect to peers without protocol encryption</string> @@ -2465,10 +2462,7 @@ Disable encryption: Only connect to peers without protocol encryption</string>
<number>-1</number>
</property>
<property name="maximum">
<number>999</number>
</property>
<property name="value">
<number>3</number>
<number>2147483647</number>
</property>
</widget>
</item>
@ -2488,10 +2482,7 @@ Disable encryption: Only connect to peers without protocol encryption</string> @@ -2488,10 +2482,7 @@ Disable encryption: Only connect to peers without protocol encryption</string>
<number>-1</number>
</property>
<property name="maximum">
<number>999</number>
</property>
<property name="value">
<number>5</number>
<number>2147483647</number>
</property>
</widget>
</item>

Loading…
Cancel
Save