wornvirtue
/
premiere-libtorrent
forked from premiere/premiere-libtorrent
1
0
Fork 0
Code Pull Requests Activity

various smaller fixes

This commit is contained in:
Arvid Norberg 2010-12-30 03:46:11 +00:00
parent 26053e4b76
commit 00efc31bf6
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/disk_io_thread.cpp
View File

@ -378,6 +378,7 @@ namespace libtorrent
disk_io_job j; disk_io_job j;
m_waiting_to_shutdown = true; m_waiting_to_shutdown = true;
j.action = disk_io_job::abort_thread; j.action = disk_io_job::abort_thread;
j.start_time = time_now_hires();
m_jobs.insert(m_jobs.begin(), j); m_jobs.insert(m_jobs.begin(), j);
m_signal.signal(l); m_signal.signal(l);
} }

1
src/policy.cpp
View File

@ -744,6 +744,7 @@ namespace libtorrent
if (found) if (found)
{ {
i = *iter; i = *iter;
TORRENT_ASSERT(i->connection != &c);
if (i->banned) if (i->banned)
{ {

2
test/test_primitives.cpp
View File

@ -383,7 +383,7 @@ TORRENT_EXPORT void find_control_url(int type, char const* string, parse_state&
address rand_v4() address rand_v4()
{ {
return address_v4(rand() << 16 | rand()); return address_v4((rand() << 16 | rand()) & 0xffffffff);
} }
int test_main() int test_main()