*** empty log message ***
This commit is contained in:
parent
579d63f49d
commit
a282a51c4d
|
@ -115,10 +115,7 @@ namespace libtorrent
|
||||||
// loop in session_impl will check for this state
|
// loop in session_impl will check for this state
|
||||||
// on all torrents once every second, and take
|
// on all torrents once every second, and take
|
||||||
// the necessary actions then.
|
// the necessary actions then.
|
||||||
void abort()
|
void abort() { m_abort = true; m_event = tracker_request::stopped; }
|
||||||
{
|
|
||||||
m_abort = true; m_event = tracker_request::stopped;
|
|
||||||
}
|
|
||||||
bool is_aborted() const { return m_abort; }
|
bool is_aborted() const { return m_abort; }
|
||||||
|
|
||||||
// is called every second by session. This will
|
// is called every second by session. This will
|
||||||
|
|
|
@ -1223,7 +1223,7 @@ namespace libtorrent
|
||||||
{
|
{
|
||||||
boost::mutex::scoped_lock lock(mutex);
|
boost::mutex::scoped_lock lock(mutex);
|
||||||
data.progress = (float)current_slot / m_info.num_pieces();
|
data.progress = (float)current_slot / m_info.num_pieces();
|
||||||
if (data.abort || data.torrent_ptr->is_aborted())
|
if (data.abort || (data.torrent_ptr && data.torrent_ptr->is_aborted()))
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue