twisterarmy/twister-core
1
0
Fork 0
mirror of https://github.com/twisterarmy/twister-core.git synced 2025-01-22 20:44:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge ../twister-bare

Browse Source
This commit is contained in:
Miguel Freitas 2013-11-23 13:09:16 -02:00
commit dd128a39a1
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libtorrent/src/torrent.cpp
View File

@ -7136,7 +7136,8 @@ namespace libtorrent
TORRENT_ASSERT(m_ses.is_network_thread()); TORRENT_ASSERT(m_ses.is_network_thread());
if (m_allow_peers == b if (m_allow_peers == b
&& m_graceful_pause_mode == graceful) return; && (m_graceful_pause_mode == graceful
|| m_ses.is_paused()) ) return;
m_allow_peers = b; m_allow_peers = b;
if (!m_ses.is_paused()) if (!m_ses.is_paused())

4
src/init.cpp
View File

@ -245,7 +245,7 @@ std::string HelpMessage()
strUsage += " -keypool=<n> " + _("Set key pool size to <n> (default: 100)") + "\n"; strUsage += " -keypool=<n> " + _("Set key pool size to <n> (default: 100)") + "\n";
strUsage += " -rescan " + _("Rescan the block chain for missing wallet transactions") + "\n"; strUsage += " -rescan " + _("Rescan the block chain for missing wallet transactions") + "\n";
strUsage += " -salvagewallet " + _("Attempt to recover private keys from a corrupt twisterwallet.dat") + "\n"; strUsage += " -salvagewallet " + _("Attempt to recover private keys from a corrupt twisterwallet.dat") + "\n";
strUsage += " -checkblocks=<n> " + _("How many blocks to check at startup (default: 48, 0 = all)") + "\n"; strUsage += " -checkblocks=<n> " + _("How many blocks to check at startup (default: 12, 0 = all)") + "\n";
strUsage += " -checklevel=<n> " + _("How thorough the block verification is (0-4, default: 3)") + "\n"; strUsage += " -checklevel=<n> " + _("How thorough the block verification is (0-4, default: 3)") + "\n";
strUsage += " -txindex " + _("Maintain a full transaction index (default: 0)") + "\n"; strUsage += " -txindex " + _("Maintain a full transaction index (default: 0)") + "\n";
strUsage += " -loadblock=<file> " + _("Imports blocks from external blk000??.dat file") + "\n"; strUsage += " -loadblock=<file> " + _("Imports blocks from external blk000??.dat file") + "\n";
@ -755,7 +755,7 @@ bool AppInit2(boost::thread_group& threadGroup)
uiInterface.InitMessage(_("Verifying blocks...")); uiInterface.InitMessage(_("Verifying blocks..."));
if (!VerifyDB(GetArg("-checklevel", 3), if (!VerifyDB(GetArg("-checklevel", 3),
GetArg( "-checkblocks", 48))) { GetArg( "-checkblocks", 12))) {
strLoadError = _("Corrupted block database detected"); strLoadError = _("Corrupted block database detected");
break; break;
} }

7
src/twister.cpp
View File

@ -1599,10 +1599,9 @@ Value follow(const Array& params, bool fHelp)
string username = users[u].get_str(); string username = users[u].get_str();
torrent_handle h = startTorrentUser(username); torrent_handle h = startTorrentUser(username);
LOCK(cs_twister); if( h.is_valid() ) {
if( h.is_valid() && m_users.count(localUser) && LOCK(cs_twister);
!m_users[localUser].m_following.count(username) ) { m_users[localUser].m_following.insert(username);
m_users[localUser].m_following.insert(username);
} }
} }