open client sockets before video starts, so that the Windows Firewall

[xonotic/darkplaces.git] / host.c

diff --git a/host.c b/host.c
index a143a16f111302bc487058e5ad9594e27dc6faf4..f00b8e6d0623a3caa18779d6afe507076b8fa1f6 100644 (file)
--- a/host.c
+++ b/host.c
@@ -103,7 +103,8 @@ void Host_Error (const char *error, ...)
        va_list argptr;
 
        // turn off rcon redirect if it was active when the crash occurred
-       rcon_redirect = false;
+       // to prevent loops when it is a networking problem
+       Con_Rcon_Redirect_Abort();
 
        va_start (argptr,error);
        dpvsnprintf (hosterrorstring1,sizeof(hosterrorstring1),error,argptr);
@@ -202,6 +203,7 @@ Host_InitLocal
 */
 void Host_SaveConfig_f(void);
 void Host_LoadConfig_f(void);
+extern cvar_t sv_writepicture_quality;
 static void Host_InitLocal (void)
 {
        Cmd_AddCommand("saveconfig", Host_SaveConfig_f, "save settings to config.cfg (or a specified filename) immediately (also automatic when quitting)");
@@ -225,6 +227,8 @@ static void Host_InitLocal (void)
 
        Cvar_RegisterVariable (&timestamps);
        Cvar_RegisterVariable (&timeformat);
+
+       Cvar_RegisterVariable (&sv_writepicture_quality);
 }
 
 
@@ -244,7 +248,7 @@ void Host_SaveConfig_to(const char *file)
        // LordHavoc: don't save a config if it crashed in startup
        if (host_framecount >= 3 && cls.state != ca_dedicated && !COM_CheckParm("-benchmark") && !COM_CheckParm("-capturedemo"))
        {
-               f = FS_Open (file, "wb", false, false);
+               f = FS_OpenRealFile(file, "wb", false);
                if (!f)
                {
                        Con_Printf("Couldn't write %s.\n", file);
@@ -925,6 +929,8 @@ void Host_StartVideo(void)
        if (!vid_opened && cls.state != ca_dedicated)
        {
                vid_opened = true;
+               // make sure we open sockets before opening video because the Windows Firewall "unblock?" dialog can screw up the graphics context on some graphics drivers
+               NetConn_UpdateSockets();
                VID_Start();
                CDAudio_Startup();
        }