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-11-10 01:37:35 +01:00
parent 8ac6bbe553 d9de6767a7
commit 1ed68551d7
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -447,7 +447,7 @@ AS_CASE(["$ARG_WITH_LIBICONV"],
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
AM_ICONV() AM_ICONV()
AS_IF([test "x$am_cv_func_iconv" = "xyes"], [ AS_IF([test "x$am_cv_func_iconv" = "xyes"], [
ICONV_LIBS=$LTLIBICONV ICONV_LIBS=$LIBICONV
AC_SUBST([ICONV_LIBS]) AC_SUBST([ICONV_LIBS])
LIBS="$ICONV_LIBS $LIBS" LIBS="$ICONV_LIBS $LIBS"
], [ ], [

5
src/session_impl.cpp
View File

@ -3139,13 +3139,16 @@ namespace {
// we have to keep ticking the utp socket manager // we have to keep ticking the utp socket manager
// until they're all closed // until they're all closed
// we also have to keep updating the aux time while
// there are outstanding announces
if (m_abort) if (m_abort)
{ {
if (m_utp_socket_manager.num_sockets() == 0 if (m_utp_socket_manager.num_sockets() == 0
#ifdef TORRENT_USE_OPENSSL #ifdef TORRENT_USE_OPENSSL
&& m_ssl_utp_socket_manager.num_sockets() == 0 && m_ssl_utp_socket_manager.num_sockets() == 0
#endif #endif
&& m_undead_peers.empty()) && m_undead_peers.empty()
&& m_tracker_manager.empty())
{ {
return; return;
} }