diff options
| author | Timo Sirainen <cras@irssi.org> | 2001-12-06 23:05:54 +0000 |
|---|---|---|
| committer | cras <cras@dbcabf3a-b0e7-0310-adc4-f8d773084564> | 2001-12-06 23:05:54 +0000 |
| commit | 6be1390303322916eb82e29ee7693eac2023c3dd (patch) | |
| tree | 7d66474d513c1245b74e50a5486982178d7d2e93 | |
| parent | 6e2b0d41d925f5807464d96bf102b9f67314aa33 (diff) | |
| download | irssi-6be1390303322916eb82e29ee7693eac2023c3dd.zip | |
/UPGRADE broke reconnections to server.
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@2204 dbcabf3a-b0e7-0310-adc4-f8d773084564
| -rw-r--r-- | src/core/server-rec.h | 1 | ||||
| -rw-r--r-- | src/core/servers-reconnect.c | 2 | ||||
| -rw-r--r-- | src/core/session.c | 2 | ||||
| -rw-r--r-- | src/perl/module.h | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/src/core/server-rec.h b/src/core/server-rec.h index 967da1f2..b88d2a41 100644 --- a/src/core/server-rec.h +++ b/src/core/server-rec.h @@ -13,6 +13,7 @@ char *nick; /* current nick */ unsigned int connected:1; /* connected to server */ unsigned int connection_lost:1; /* Connection lost unintentionally */ unsigned int session_reconnect:1; /* Connected to this server with /UPGRADE */ +unsigned int no_reconnect:1; /* Don't reconnect to server */ NET_SENDBUF_REC *handle; int readtag; /* input tag */ diff --git a/src/core/servers-reconnect.c b/src/core/servers-reconnect.c index 4e497026..8b59d06d 100644 --- a/src/core/servers-reconnect.c +++ b/src/core/servers-reconnect.c @@ -172,7 +172,7 @@ server_connect_copy_skeleton(SERVER_CONNECT_REC *src, int connect_info) } #define server_should_reconnect(server) \ - ((server)->connection_lost && !(server)->session_reconnect && \ + ((server)->connection_lost && !(server)->no_reconnect && \ ((server)->connrec->chatnet != NULL || \ (!(server)->banned && !(server)->dns_error))) diff --git a/src/core/session.c b/src/core/session.c index 3d90a02c..e72bf64a 100644 --- a/src/core/session.c +++ b/src/core/session.c @@ -189,7 +189,7 @@ static void session_save_server(SERVER_REC *server, CONFIG_REC *config, server->handle = NULL; server->connection_lost = TRUE; - server->session_reconnect = TRUE; + server->no_reconnect = TRUE; server_disconnect(server); } diff --git a/src/perl/module.h b/src/perl/module.h index bf00817d..c54cd61a 100644 --- a/src/perl/module.h +++ b/src/perl/module.h @@ -22,4 +22,4 @@ extern PerlInterpreter *my_perl; /* must be called my_perl or some perl implemen /* Change this every time when some API changes between irssi's perl module (or irssi itself) and irssi's perl libraries. */ -#define IRSSI_PERL_API_VERSION 20011111 +#define IRSSI_PERL_API_VERSION 20011204 |