From 8eec5389fe2a979be502351c2ff3e29442d38128 Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Sun, 12 Jun 2022 03:07:37 +0300 Subject: [PATCH] game_launch: fix gamedir pointer being lost --- game_launch/game.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/game_launch/game.cpp b/game_launch/game.cpp index 5ebac7e8..c4da3a55 100644 --- a/game_launch/game.cpp +++ b/game_launch/game.cpp @@ -138,7 +138,6 @@ static void Sys_ChangeGame( const char *progname ) { if( !progname || !progname[0] ) Xash_Error( "Sys_ChangeGame: NULL gamedir" ); - #if USE_EXECVE_FOR_CHANGE_GAME #if XASH_WIN32 _putenv_s( E_GAME, progname ); @@ -157,8 +156,9 @@ static void Sys_ChangeGame( const char *progname ) if( Xash_Shutdown == NULL ) Xash_Error( "Sys_ChangeGame: missed 'Host_Shutdown' export\n" ); - Sys_UnloadEngine(); strncpy( szGameDir, progname, sizeof( szGameDir ) - 1 ); + + Sys_UnloadEngine(); Sys_LoadEngine (); Xash_Main( szArgc, szArgv, szGameDir, 1, Sys_ChangeGame ); #endif