philippelh/bitchx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplification of logic in server_lost()

Browse Source 
Should have no change to behaviour.
This commit is contained in:
Kevin Easton
2019-01-23 23:40:24 +11:00
parent 18227203d9
commit 062a5b781f
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/server.c
View File

@@ -621,10 +621,9 @@ static void server_lost(int s)
{ {
set_server_reconnect(s, 1); set_server_reconnect(s, 1);
if (server_list[s].from_server != -1) if ((server_list[s].from_server != -1) && (server_list[s].from_server != s))
{ {
if ((server_list[server_list[s].from_server].read != -1) && if (is_server_open(server_list[s].from_server))
(server_list[s].from_server != s))
{ {
/* Set the windows back to the old server */ /* Set the windows back to the old server */
say("Connection to server %s resumed...", server_list[server_list[s].from_server].name); say("Connection to server %s resumed...", server_list[server_list[s].from_server].name);
@@ -632,7 +631,7 @@ static void server_lost(int s)
set_window_server(-1, s, 1); set_window_server(-1, s, 1);
set_server_reconnect(s, 0); set_server_reconnect(s, 0);
} }
else if (server_list[s].from_server != s) else
{ {
close_server(server_list[s].from_server, empty_string); close_server(server_list[s].from_server, empty_string);
} }