net: better masterserver communication

[d2df-sdl.git] / src / game / g_net.pas

diff --git a/src/game/g_net.pas b/src/game/g_net.pas
index 391e09c520a6f6513ecfe6c52a9377c2009a4bc8..4deca1e4c2f65356a7a2ebfcb886a0480bfb9aef 100644 (file)
--- a/src/game/g_net.pas
+++ b/src/game/g_net.pas
@@ -1383,8 +1383,7 @@ begin
 
   NetPeer := nil;
   NetHost := nil;
-  NetMPeer := nil;
-  NetMHost := nil;
+  g_Net_Slist_Disconnect(false); // do not spam console
   NetMyID := -1;
   NetPlrUID1 := -1;
   NetPlrUID2 := -1;
@@ -1519,7 +1518,7 @@ begin
     end;
 
   clearNetClients(false); // don't clear array
-  if (NetMPeer <> nil) and (NetMHost <> nil) then g_Net_Slist_Disconnect;
+  if (g_Net_Slist_IsConnectionActive) then g_Net_Slist_Disconnect;
   if NetPongSock <> ENET_SOCKET_NULL then
     enet_socket_destroy(NetPongSock);