resync with lt trunk
This commit is contained in:
parent
620aab25f9
commit
846058a8d0
|
@ -499,7 +499,7 @@ namespace libtorrent
|
||||||
{
|
{
|
||||||
// we couldn't find the torrent!
|
// we couldn't find the torrent!
|
||||||
#ifdef TORRENT_VERBOSE_LOGGING
|
#ifdef TORRENT_VERBOSE_LOGGING
|
||||||
(*m_logger) << " couldn't find a torrent with the given info_hash\n";
|
(*m_logger) << " couldn't find a torrent with the given info_hash: " << ih << "\n";
|
||||||
#endif
|
#endif
|
||||||
throw std::runtime_error("got info-hash that is not in our session");
|
throw std::runtime_error("got info-hash that is not in our session");
|
||||||
}
|
}
|
||||||
|
@ -2254,7 +2254,6 @@ namespace libtorrent
|
||||||
assert(m_reading);
|
assert(m_reading);
|
||||||
m_reading = false;
|
m_reading = false;
|
||||||
|
|
||||||
|
|
||||||
if (error)
|
if (error)
|
||||||
{
|
{
|
||||||
#ifdef TORRENT_VERBOSE_LOGGING
|
#ifdef TORRENT_VERBOSE_LOGGING
|
||||||
|
|
|
@ -2855,3 +2855,4 @@ namespace libtorrent
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue