diff --git a/src/d_netcmd.c b/src/d_netcmd.c index 790bc2850..62072d9ee 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -5693,6 +5693,12 @@ void Command_ExitGame_f(void) { INT32 i; + if (dedicated) + { + CONS_Printf("This command cannot be used on dedicated server\n"); + return; + } + D_QuitNetGame(); CL_Reset(); CV_ClearChangedFlags(); diff --git a/src/sdl/i_video.c b/src/sdl/i_video.c index bf7c30c7b..a467187bc 100644 --- a/src/sdl/i_video.c +++ b/src/sdl/i_video.c @@ -2480,9 +2480,8 @@ static void Impl_SetVsync(void) if (renderer) SDL_RenderSetVSync(renderer, cv_vidwait.value); #endif - } #ifdef HWRENDER - else if (rendermode == render_opengl && sdlglcontext != NULL && SDL_GL_GetCurrentContext() == sdlglcontext) + if (!renderer && rendermode == render_opengl && sdlglcontext != NULL && SDL_GL_GetCurrentContext() == sdlglcontext) { SDL_GL_SetSwapInterval(cv_vidwait.value ? 1 : 0); }