diff options
| author | Gavin Andresen <[email protected]> | 2010-10-19 14:17:18 -0400 |
|---|---|---|
| committer | Gavin Andresen <[email protected]> | 2010-10-19 14:17:18 -0400 |
| commit | d1e4a866adc92fd456c0a3139dcaefeb47b8c025 (patch) | |
| tree | 0ec5e0817784154794dd9b43695cf0b72291406c /net.cpp | |
| parent | Merge remote branch 'refs/remotes/svn/trunk' into svn (diff) | |
| parent | Gavin's TEST network as -testnet switch, misc fixes (diff) | |
| download | discoin-d1e4a866adc92fd456c0a3139dcaefeb47b8c025.tar.xz discoin-d1e4a866adc92fd456c0a3139dcaefeb47b8c025.zip | |
Merge remote branch 'refs/remotes/svn/trunk' into svn
Diffstat (limited to 'net.cpp')
| -rw-r--r-- | net.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -937,7 +937,7 @@ void ThreadOpenConnections2(void* parg) // Add seed nodes if IRC isn't working static bool fSeedUsed; bool fTOR = (fUseProxy && addrProxy.port == htons(9050)); - if (mapAddresses.empty() && (GetTime() - nStart > 60 || fTOR)) + if (mapAddresses.empty() && (GetTime() - nStart > 60 || fTOR) && !fTestNet) { for (int i = 0; i < ARRAYLEN(pnSeed); i++) { |