about summary refs log tree commit diff
path: root/src/engine/client/ec_client.c
diff options
context:
space:
mode:
authorMagnus Auvinen <magnus.auvinen@gmail.com>2007-12-20 00:26:50 +0000
committerMagnus Auvinen <magnus.auvinen@gmail.com>2007-12-20 00:26:50 +0000
commite06dd7d5d7e3637d07181e0eaaea87a4e4bb5111 (patch)
treeca33f01afdebe03dfdbb28f9e73d4709f8d6dc75 /src/engine/client/ec_client.c
parentd84e653f6df0a04075056ecf7a1e65788a9bc48e (diff)
downloadzcatch-e06dd7d5d7e3637d07181e0eaaea87a4e4bb5111.tar.gz
zcatch-e06dd7d5d7e3637d07181e0eaaea87a4e4bb5111.zip
fixed crash when joining a server when connected to one already
Diffstat (limited to 'src/engine/client/ec_client.c')
-rw-r--r--src/engine/client/ec_client.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/engine/client/ec_client.c b/src/engine/client/ec_client.c
index 9773d364..1b9b0120 100644
--- a/src/engine/client/ec_client.c
+++ b/src/engine/client/ec_client.c
@@ -396,6 +396,8 @@ void client_connect(const char *server_address_str)
 	const char *port_str = 0;
 	int k;
 	int port = 8303;
+	
+	client_disconnect();
 
 	dbg_msg("client", "connecting to '%s'", server_address_str);
 
@@ -435,9 +437,7 @@ void client_disconnect_with_reason(const char *reason)
 
 void client_disconnect()
 {
-	netclient_disconnect(net, 0);
-	client_set_state(CLIENTSTATE_OFFLINE);
-	map_unload();
+	client_disconnect_with_reason(0);
 }
 
 static int client_load_data()