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

moved GeoIP destruction inside session lock

This commit is contained in:
Arvid Norberg 2010-03-16 07:00:23 +00:00
parent 2910a4a10c
commit 7775457441
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/session_impl.cpp
View File

@ -3459,6 +3459,13 @@ namespace aux {
abort(); abort();
TORRENT_ASSERT(m_connections.empty()); TORRENT_ASSERT(m_connections.empty());
#ifndef TORRENT_DISABLE_GEO_IP
if (m_asnum_db) GeoIP_delete(m_asnum_db);
if (m_country_db) GeoIP_delete(m_country_db);
m_asnum_db = 0;
m_country_db = 0;
#endif
l.unlock(); l.unlock();
// we need to wait for the disk-io thread to // we need to wait for the disk-io thread to
// die first, to make sure it won't post any // die first, to make sure it won't post any
@ -3471,12 +3478,6 @@ namespace aux {
#endif #endif
m_disk_thread.join(); m_disk_thread.join();
#ifndef TORRENT_DISABLE_GEO_IP
if (m_asnum_db) GeoIP_delete(m_asnum_db);
if (m_country_db) GeoIP_delete(m_country_db);
m_asnum_db = 0;
m_country_db = 0;
#endif
#if defined(TORRENT_VERBOSE_LOGGING) || defined(TORRENT_LOGGING) #if defined(TORRENT_VERBOSE_LOGGING) || defined(TORRENT_LOGGING)
(*m_logger) << time_now_string() << " waiting for main thread\n"; (*m_logger) << time_now_string() << " waiting for main thread\n";
#endif #endif