summaryrefslogtreecommitdiff
path: root/src/irc
diff options
context:
space:
mode:
authorTimo Sirainen <cras@irssi.org>2000-10-14 00:53:59 +0000
committercras <cras@dbcabf3a-b0e7-0310-adc4-f8d773084564>2000-10-14 00:53:59 +0000
commitad97695841d0121759c0dd980d8d54786415cb5f (patch)
tree8040272fca094fb5fdec41e65d994e497cc1d788 /src/irc
parent6a3efe49ab7b41062650da894eccc2d4be0b8f45 (diff)
downloadirssi-ad97695841d0121759c0dd980d8d54786415cb5f.zip
fixes
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@740 dbcabf3a-b0e7-0310-adc4-f8d773084564
Diffstat (limited to 'src/irc')
-rw-r--r--src/irc/core/channel-rejoin.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/irc/core/channel-rejoin.c b/src/irc/core/channel-rejoin.c
index 32070a79..0d50b0b2 100644
--- a/src/irc/core/channel-rejoin.c
+++ b/src/irc/core/channel-rejoin.c
@@ -27,8 +27,7 @@
#include "irc-channels.h"
#include "channel-rejoin.h"
-//#define REJOIN_TIMEOUT (1000*60*5) /* try to rejoin every 5 minutes */
-#define REJOIN_TIMEOUT (1000*10) /* FIXME: test */
+#define REJOIN_TIMEOUT (1000*60*5) /* try to rejoin every 5 minutes */
static int rejoin_tag;
@@ -122,7 +121,7 @@ static void sig_remove_rejoin(IRC_CHANNEL_REC *channel)
{
REJOIN_REC *rec;
- if (!IS_IRC_CHANNEL(channel) && channel->server != NULL)
+ if (!IS_IRC_CHANNEL(channel) || channel->server == NULL)
return;
rec = rejoin_find(channel->server, channel->name);