Merge commit 'f6b9708d076f575f8ecc2baec9d5057824dbfcae' into garux-merge

[xonotic/netradiant.git] / radiant / qe3.cpp

diff --git a/radiant/qe3.cpp b/radiant/qe3.cpp
index b073752126670a97ea9707cb5c0115850e0da4ae..efae51c42438df2c94ea4dbb88e260a618814f8c 100644 (file)
--- a/radiant/qe3.cpp
+++ b/radiant/qe3.cpp
@@ -92,7 +92,7 @@ void QE_InitVFS(){
        // if we have a mod dir
        if ( !string_equal( gamename, basegame ) ) {
                // ~/.<gameprefix>/<fs_game>
-               if ( userRoot && !g_disableHomePath ) {
+               if ( userRoot && !string_equal( globalRoot, userRoot ) && !g_disableHomePath ) {
                        StringOutputStream userGamePath( 256 );
                        userGamePath << userRoot << gamename << '/';
                        GlobalFileSystem().initDirectory( userGamePath.c_str() );
@@ -107,7 +107,7 @@ void QE_InitVFS(){
        }
 
        // ~/.<gameprefix>/<fs_main>
-       if ( userRoot && !g_disableHomePath ) {
+       if ( userRoot && !string_equal( globalRoot, userRoot ) && !g_disableHomePath ) {
                StringOutputStream userBasePath( 256 );
                userBasePath << userRoot << basegame << '/';
                GlobalFileSystem().initDirectory( userBasePath.c_str() );