summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTimo Sirainen <cras@irssi.org>2000-11-27 15:47:26 +0000
committercras <cras@dbcabf3a-b0e7-0310-adc4-f8d773084564>2000-11-27 15:47:26 +0000
commit95bc994779a18434cc8a20f25c60c27b9650dffb (patch)
treeee4b10c75b4b32e527fb7411e0ecf13595d56a12 /src
parentb16682f4fd58f04423fc9f411910edf90564bf32 (diff)
downloadirssi-95bc994779a18434cc8a20f25c60c27b9650dffb.zip
don't destroy all netsplits when someone joins back from split, only
the nicks that were in same server git-svn-id: http://svn.irssi.org/repos/irssi/trunk@892 dbcabf3a-b0e7-0310-adc4-f8d773084564
Diffstat (limited to 'src')
-rw-r--r--src/irc/core/netsplit.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/irc/core/netsplit.c b/src/irc/core/netsplit.c
index d745a978..963b18bf 100644
--- a/src/irc/core/netsplit.c
+++ b/src/irc/core/netsplit.c
@@ -257,7 +257,8 @@ int quitmsg_is_split(const char *msg)
static void split_set_timeout(void *key, NETSPLIT_REC *rec, NETSPLIT_REC *orig)
{
/* same servers -> split over -> destroy old records sooner.. */
- rec->destroy = time(NULL)+60;
+ if (rec->server == orig->server)
+ rec->destroy = time(NULL)+60;
}
static void event_join(const char *data, IRC_SERVER_REC *server,