Merge commit 'ffb487e45c26dccd20285849979be1cb261c52f6' into master-merge

[xonotic/netradiant.git] / tools / quake3 / q3map2 / path_init.c

diff --git a/tools/quake3/q3map2/path_init.c b/tools/quake3/q3map2/path_init.c
index 322173c95509f9ea009959a36e3ecb4838414216..9bc5dd340c75c414b55001c41d0a53fb6f5047a6 100644 (file)
--- a/tools/quake3/q3map2/path_init.c
+++ b/tools/quake3/q3map2/path_init.c
@@ -295,6 +295,7 @@ void AddBasePath( char *path ){
        basePaths[ numBasePaths ] = safe_malloc( strlen( path ) + 1 );
        strcpy( basePaths[ numBasePaths ], path );
        CleanPath( basePaths[ numBasePaths ] );
+       if ( EnginePath[0] == '\0' ) strcpy( EnginePath, basePaths[ numBasePaths ] );
        numBasePaths++;
 }
 
@@ -460,6 +461,8 @@ void InitPaths( int *argc, char **argv ){
        numBasePaths = 0;
        numGamePaths = 0;
 
+       EnginePath[0] = '\0';
+
        /* parse through the arguments and extract those relevant to paths */
        for ( i = 0; i < *argc; i++ )
        {