Merge ../twister-bare

libtorrent/src/torrent.cpp

@@ -7136,7 +7136,8 @@ namespace libtorrent
 		TORRENT_ASSERT(m_ses.is_network_thread());
 
 		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;
 		if (!m_ses.is_paused())

src/init.cpp

@@ -245,7 +245,7 @@ std::string HelpMessage()
     strUsage += "  -keypool=<n>           " + _("Set key pool size to <n> (default: 100)") + "\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 += "  -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 += "  -txindex               " + _("Maintain a full transaction index (default: 0)") + "\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..."));
                 if (!VerifyDB(GetArg("-checklevel", 3),
-                              GetArg( "-checkblocks", 48))) {
+                              GetArg( "-checkblocks", 12))) {
                     strLoadError = _("Corrupted block database detected");
                     break;
                 }

src/twister.cpp

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