highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-02-03 22:03:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix issue #659, and cleanup wallet/command-line argument handling a bit

Browse Source 
Conflicts:
	src/init.cpp
	src/util.cpp
This commit is contained in:
Gavin Andresen
2012-01-03 10:14:22 -05:00
committed by Luke Dashjr
parent b52b6f2e38
commit 84393f15b6
5 changed files with 83 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/net.cpp
View File

@@ -1405,7 +1405,7 @@ void ThreadOpenConnections2(void* parg)
{
// Add seed nodes if IRC isn't working
bool fTOR = (fUseProxy && addrProxy.port == htons(9050));
if (mapAddresses.empty() && (GetTime() - nStart > 60 || fTOR) && !fTestNet)
if (mapAddresses.empty() && (GetTime() - nStart > 60 || fUseProxy) && !fTestNet)
fAddSeeds = true;
}