forked from premiere/premiere-libtorrent
merged RC_1_1 into master
This commit is contained in:
commit
1ed68551d7
|
@ -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"
|
||||||
], [
|
], [
|
||||||
|
|
|
@ -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;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue