premiere
/
premiere-libtorrent
2
2
Fork 1
Code Issues Pull Requests Releases Wiki Activity

merged RC_1_1 into master

This commit is contained in:
arvidn 2017-10-14 15:22:22 +02:00
parent 8adcfdbf41 6214103619
commit f0bac4cac7
4 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -288,10 +288,15 @@ if (WIN32)
target_link_libraries(torrent-rasterbar wsock32 ws2_32 Iphlpapi)
# target Windows Vista or later
target_compile_definitions(torrent-rasterbar PUBLIC _WIN32_WINNT=0x0600)
target_link_libraries(torrent-rasterbar debug dbghelp)
# prevent winsock1 to be included
target_compile_definitions(torrent-rasterbar PUBLIC WIN32_LEAN_AND_MEAN)
if (MSVC)
target_compile_definitions(torrent-rasterbar PUBLIC BOOST_ALL_NO_LIB)
# for multicore compilation
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
# increase the number of sections for obj files
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj")
endif()
endif()

2
ChangeLog
View File

@ -95,6 +95,8 @@
* don't attempt to create empty files on startup, if they already exist
* fix force-recheck issue (new files would not be picked up)
* fix inconsistency in file_priorities and override_resume_data behavior
* fix paused torrents not generating a state update when their ul/dl rate
transitions to zero
1.1.4 release

2
include/libtorrent/settings_pack.hpp
View File

@ -922,7 +922,7 @@ namespace libtorrent {
//
// * ``fixed_slots_choker`` is the traditional choker with a fixed
// number of unchoke slots (as specified by
// ``session::set_max_uploads()``).
// ``settings_pack::unchoke_slots_limit``).
//
// * ``rate_based_choker`` opens up unchoke slots based on the upload
// rate achieved to peers. The more slots that are opened, the

8
src/torrent.cpp
View File

@ -8997,11 +8997,13 @@ namespace libtorrent {
if (is_paused() && !m_graceful_pause_mode)
{
// let the stats fade out to 0
m_stat.second_tick(tick_interval_ms);
// if the rate is 0, there's no update because of network transfers
// check the rate before ticking the stats so that the last update is sent
// with the rate equal to zero
if (m_stat.low_pass_upload_rate() > 0 || m_stat.low_pass_download_rate() > 0)
state_updated();
else
m_stat.second_tick(tick_interval_ms);
// if the rate is 0, there's no update because of network transfers
if (!(m_stat.low_pass_upload_rate() > 0 || m_stat.low_pass_download_rate() > 0))
update_want_tick();
return;