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

merge RC_1_1 into master

This commit is contained in:
arvidn 2017-05-20 15:21:01 -04:00
parent 22145d8cfa 83735fdbb4
commit 604904c80c
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -73,6 +73,7 @@
* require C++11 to build libtorrent * require C++11 to build libtorrent
* fix NAT-PMP crash when removing a mapping at the wrong time
* improve path sanitization (filter unicode text direction characters) * improve path sanitization (filter unicode text direction characters)
* deprecate partial_piece_info::piece_state * deprecate partial_piece_info::piece_state
* bind upnp requests to correct local address * bind upnp requests to correct local address

3
src/natpmp.cpp
View File

@ -278,7 +278,8 @@ void natpmp::try_next_mapping(int const i)
auto const m = std::find_if( auto const m = std::find_if(
m_mappings.begin(), m_mappings.end() m_mappings.begin(), m_mappings.end()
, [] (mapping_t const& ma) { return ma.act != mapping_t::action::none; }); , [] (mapping_t const& ma) { return ma.act != mapping_t::action::none
&& ma.protocol != portmap_protocol::none; });
if (m == m_mappings.end()) if (m == m_mappings.end())
{ {