From c68a356202387738df854ddbc7046e08a5ca777c Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Tue, 4 May 2021 21:06:53 +0200 Subject: [PATCH] fix crash in release build --- CMakeSettings.json | 14 +++++++++++++- src/laws.c | 2 -- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/CMakeSettings.json b/CMakeSettings.json index 83de1577e..a6f1a878f 100644 --- a/CMakeSettings.json +++ b/CMakeSettings.json @@ -45,6 +45,18 @@ "type": "STRING" } ] + }, + { + "name": "x64-Release", + "generator": "Ninja", + "configurationType": "RelWithDebInfo", + "buildRoot": "${projectDir}\\out\\build\\${name}", + "installRoot": "${projectDir}\\out\\install\\${name}", + "cmakeCommandArgs": "", + "buildCommandArgs": "", + "ctestCommandArgs": "", + "inheritEnvironments": [ "msvc_x64_x64" ], + "variables": [] } ] -} +} \ No newline at end of file diff --git a/src/laws.c b/src/laws.c index d67d90b18..d9ec9afca 100644 --- a/src/laws.c +++ b/src/laws.c @@ -2965,10 +2965,8 @@ void maketemp_cmd(unit *u, order **olist) ship *sh; unit *u2; order **ordp, **oinsert; -#ifndef NDEBUG keyword_t kwd = init_order(makeord, NULL); assert(kwd == K_MAKETEMP); -#endif alias = getid(); s = gettoken(token, sizeof(token)); if (s && s[0] == '\0') {