diff options
| author | Adam <Adam@anope.org> | 2010-09-07 18:41:44 -0400 |
|---|---|---|
| committer | Adam <Adam@anope.org> | 2010-09-07 18:41:44 -0400 |
| commit | bd94cbc25b27250872ba4e682cf7af36e16a2d25 (patch) | |
| tree | 0ccdfe2e32e132b0f61c62e73fdad2595883bd2a /src/init.c | |
| parent | 3a97d196f9744a75a715cf3bc8bd0d36683e4ece (diff) | |
| parent | 22894e9e09bb0e3c76d866a9568d654d73920526 (diff) | |
Merge branch '1.8' of git.sigterm.info:gitroot/anope/anope into 1.8
Diffstat (limited to 'src/init.c')
| -rw-r--r-- | src/init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/init.c b/src/init.c index ad3ef5af5..44f74074c 100644 --- a/src/init.c +++ b/src/init.c @@ -485,7 +485,7 @@ int init_secondary(int ac, char **av) parse_options(ac, av); /* Parse the defcon mode string if needed */ - if (DefConLevel) { + if (DefConLevel && !ircd->delay_cl_intro) { if (!defconParseModeString(DefConChanModes)) { fprintf(stderr, "services.conf: The given DefConChanModes mode string was incorrect (see log for exact errors)\n"); |