fixed very annoying '5 second timeout' bug in Host_ShutdownServer (the local client...

[xonotic/darkplaces.git] / host.c

diff --git a/host.c b/host.c
index 61c9bb0b05502c65d42cd7a612f1b2bb95805f90..4aea3260bc5a80423a1fbadcf67aadcd4c0f3f84 100644 (file)
--- a/host.c
+++ b/host.c
@@ -111,8 +111,7 @@ void Host_EndGame (const char *format, ...)
        va_end (argptr);
        Con_DPrintf("Host_EndGame: %s\n",string);
 
        va_end (argptr);
        Con_DPrintf("Host_EndGame: %s\n",string);
 

-       if (sv.active)
-               Host_ShutdownServer (false);
+       Host_ShutdownServer (false);

 
        if (cls.state == ca_dedicated)
                Sys_Error ("Host_EndGame: %s\n",string);        // dedicated servers exit
 
        if (cls.state == ca_dedicated)
                Sys_Error ("Host_EndGame: %s\n",string);        // dedicated servers exit


@@ -168,8 +167,7 @@ void Host_Error (const char *error, ...)
 
        PRVM_ProcessError();
 
 
        PRVM_ProcessError();
 

-       if (sv.active)
-               Host_ShutdownServer (false);
+       Host_ShutdownServer (false);

 
        if (cls.state == ca_dedicated)
                Sys_Error ("Host_Error: %s\n",hosterrorstring2);        // dedicated servers exit
 
        if (cls.state == ca_dedicated)
                Sys_Error ("Host_Error: %s\n",hosterrorstring2);        // dedicated servers exit


@@ -507,14 +505,11 @@ void Host_ShutdownServer(qboolean crash)
        if (!sv.active)
                return;
 
        if (!sv.active)
                return;
 

+       Con_DPrintf("Host_ShutdownServer\n");
+

        // print out where the crash happened, if it was caused by QC
        PR_Crash();
 
        // print out where the crash happened, if it was caused by QC
        PR_Crash();
 

-       sv.active = false;
-
-// stop all client sounds immediately
-       CL_Disconnect();
-

        NetConn_Heartbeat(2);
        NetConn_Heartbeat(2);
 
        NetConn_Heartbeat(2);
        NetConn_Heartbeat(2);
 


@@ -533,6 +528,8 @@ void Host_ShutdownServer(qboolean crash)
 
        NetConn_CloseServerPorts();
 
 
        NetConn_CloseServerPorts();
 

+       sv.active = false;
+

 //
 // clear structures
 //
 //
 // clear structures
 //