aboutsummaryrefslogtreecommitdiff
path: root/irc.cpp
diff options
context:
space:
mode:
authorGavin Andresen <[email protected]>2011-01-18 14:46:46 -0500
committerGavin Andresen <[email protected]>2011-01-18 14:46:46 -0500
commitc9f70b381dc8ee4197fd5b3d4d20f302632da0ed (patch)
treec9de69cd651024487fed16ec890e20ef1e721202 /irc.cpp
parentEndModal fix for Mac from piotrp (diff)
parentMerge branch 'listaccountsbug' of https://github.com/gavinandresen/bitcoin-gi... (diff)
downloaddiscoin-c9f70b381dc8ee4197fd5b3d4d20f302632da0ed.tar.xz
discoin-c9f70b381dc8ee4197fd5b3d4d20f302632da0ed.zip
Merge branch 'integration' into FIXES
Diffstat (limited to 'irc.cpp')
-rw-r--r--irc.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/irc.cpp b/irc.cpp
index aad9beb76..5adaf1165 100644
--- a/irc.cpp
+++ b/irc.cpp
@@ -257,8 +257,10 @@ void ThreadIRCSeed(void* parg)
void ThreadIRCSeed2(void* parg)
{
- if (mapArgs.count("-connect"))
+ /* Dont advertise on IRC if we don't allow incoming connections */
+ if (mapArgs.count("-connect") || fNoListen)
return;
+
if (GetBoolArg("-noirc"))
return;
printf("ThreadIRCSeed started\n");