diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2012-01-03 10:14:22 -0500 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-01-03 11:48:44 -0500 |
| commit | 84393f15b60ff5392da69b7cc208ffb5e8d209f0 (patch) | |
| tree | d536b944eb7a466cfafb8f87e7f4bf6a4b5075f4 /src/net.cpp | |
| parent | b52b6f2e3801fe14e09d646415cb798c565063d5 (diff) | |
| download | bitcoin-84393f15b60ff5392da69b7cc208ffb5e8d209f0.tar.xz | |
Fix issue #659, and cleanup wallet/command-line argument handling a bit
Conflicts:
src/init.cpp
src/util.cpp
Diffstat (limited to 'src/net.cpp')
| -rw-r--r-- | src/net.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/net.cpp b/src/net.cpp index 0f3b7cc863..c7475b118c 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -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; } |