From 13a9b36bb3bb023ab6812cd909c0e5244c55b546 Mon Sep 17 00:00:00 2001 From: Spoike Date: Mon, 15 Jun 2015 07:40:58 +0000 Subject: [PATCH] make sure ktx gets shut down properly. condition on -nowmfullscreen was inverted. git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4902 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/gl/gl_vidlinuxglx.c | 2 +- engine/server/pr_cmds.c | 3 +++ engine/server/pr_q1qvm.c | 8 +------- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/engine/gl/gl_vidlinuxglx.c b/engine/gl/gl_vidlinuxglx.c index 31db1cf13..cf637fc09 100644 --- a/engine/gl/gl_vidlinuxglx.c +++ b/engine/gl/gl_vidlinuxglx.c @@ -1433,7 +1433,7 @@ qboolean X_CheckWMFullscreenAvailable(void) unsigned char *wmname; int i; - if (!COM_CheckParm("-nowmfullscreen")) + if (COM_CheckParm("-nowmfullscreen")) { Con_Printf("Window manager fullscreen support disabled. Will attempt to hide from it instead.\n"); return success; diff --git a/engine/server/pr_cmds.c b/engine/server/pr_cmds.c index 864faca50..9253cd9bb 100644 --- a/engine/server/pr_cmds.c +++ b/engine/server/pr_cmds.c @@ -620,6 +620,9 @@ void PR_Deinit(void) int i; PRSV_ClearThreads(); +#ifdef VM_Q1 + Q1QVM_Shutdown(); +#endif if (svprogfuncs) { PR_Common_Shutdown(svprogfuncs, false); diff --git a/engine/server/pr_q1qvm.c b/engine/server/pr_q1qvm.c index ce6903f28..2caa3cc1a 100755 --- a/engine/server/pr_q1qvm.c +++ b/engine/server/pr_q1qvm.c @@ -1373,13 +1373,7 @@ qboolean PR_LoadQ1QVM(void) qintptr_t limit; extern cvar_t pr_maxedicts; - if (q1qvm) - VM_Destroy(q1qvm); - if (q1qvmedicttable) - { - Z_Free(q1qvmedicttable); - q1qvmedicttable = NULL; - } + Q1QVM_Shutdown(); q1qvm = VM_Create("qwprogs", com_nogamedirnativecode.ival?NULL:syscallnative, syscallqvm); if (!q1qvm)