From 29f9d620f99de735e73665469c8089f72a59da94 Mon Sep 17 00:00:00 2001 From: Spoike Date: Tue, 8 Mar 2022 06:20:33 +0000 Subject: [PATCH] Fix q3plug-related crashes. git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6220 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/client/cl_screen.c | 2 +- engine/server/sv_init.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/engine/client/cl_screen.c b/engine/client/cl_screen.c index 159ff1bd6..3afa9955d 100644 --- a/engine/client/cl_screen.c +++ b/engine/client/cl_screen.c @@ -2499,7 +2499,7 @@ void *SCR_ScreenShot_Capture(int fbwidth, int fbheight, int *stride, enum upload R2D_FillBlock(0, 0, vid.fbvwidth, vid.fbvheight); #ifdef VM_CG - if (!okay && q3->cg.Redraw(cl.time)) + if (!okay && q3 && q3->cg.Redraw(cl.time)) okay = true; #endif #ifdef CSQC_DAT diff --git a/engine/server/sv_init.c b/engine/server/sv_init.c index 3e6d3950a..2828e959f 100644 --- a/engine/server/sv_init.c +++ b/engine/server/sv_init.c @@ -1189,7 +1189,7 @@ MSV_OpenUserDatabase(); SVHL_ShutdownGame(); #endif #ifdef Q3SERVER - if (newgametype != GT_QUAKE3) + if (newgametype != GT_QUAKE3 && q3) q3->sv.ShutdownGame(false); #endif #ifdef Q2SERVER