From: Thomas Debesse <dev@illwieckz.net>
Date: Mon, 20 Jun 2022 02:55:44 +0000 (+0200)
Subject: Merge commit 'c5065eecd29651649c2f3d04be8af9a19d189733' into master-merge
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=db0e95d2;p=xonotic%2Fnetradiant.git

Merge commit 'c5065eecd29651649c2f3d04be8af9a19d189733' into master-merge
---

db0e95d2c3d6f175fcdfec306676c735a128c26f
diff --cc radiant/qe3.cpp
index 3b015aa4,efae51c4..69cf4c06
--- a/radiant/qe3.cpp
+++ b/radiant/qe3.cpp
@@@ -87,26 -86,17 +87,26 @@@ void QE_InitVFS()
  
  	// editor builtin VFS
  	StringOutputStream editorGamePath( 256 );
 -	editorGamePath << GlobalRadiant().getAppPath() << DEFAULT_EDITORVFS_DIRNAME;
 +	editorGamePath << GlobalRadiant().getDataPath() << DEFAULT_EDITORVFS_DIRNAME;
  	GlobalFileSystem().initDirectory( editorGamePath.c_str() );
  
 +	globalOutputStream() << "engine path: " << enginepath << "\n";
 +	globalOutputStream() << "home path: " << homepath << "\n";
 +	globalOutputStream() << "base game: " << basegame << "\n";
 +	globalOutputStream() << "game name: " << gamename << "\n";
 +
  	// if we have a mod dir
  	if ( !string_equal( gamename, basegame ) ) {
 +		// if we have a home dir
 +		if ( !string_equal( homepath, enginepath ) )
 +		{
- 			// ~/.<gameprefix>/<fs_game>
- 			if ( homepath && !g_disableHomePath ) {
- 				StringOutputStream userGamePath( 256 );
+ 		// ~/.<gameprefix>/<fs_game>
 -		if ( userRoot && !string_equal( globalRoot, userRoot ) && !g_disableHomePath ) {
++		if ( userRoot && !string_equal( globalRoot, homepath ) && !g_disableHomePath ) {
+ 			StringOutputStream userGamePath( 256 );
 -			userGamePath << userRoot << gamename << '/';
 +				userGamePath << homepath << gamename << '/';
- 				GlobalFileSystem().initDirectory( userGamePath.c_str() );
- 			}
+ 			GlobalFileSystem().initDirectory( userGamePath.c_str() );
+ 		}
 +		}
  
  		// <fs_basepath>/<fs_game>
  		if ( !g_disableEnginePath ) {
@@@ -116,16 -106,12 +116,16 @@@
  		}
  	}
  
 +	// if we have a home dir
 +	if ( !string_equal( homepath, enginepath ) )
 +	{
- 		// ~/.<gameprefix>/<fs_main>
- 		if ( homepath && !g_disableHomePath ) {
- 			StringOutputStream userBasePath( 256 );
+ 	// ~/.<gameprefix>/<fs_main>
 -	if ( userRoot && !string_equal( globalRoot, userRoot ) && !g_disableHomePath ) {
++	if ( userRoot && !string_equal( globalRoot, homepath ) && !g_disableHomePath ) {
+ 		StringOutputStream userBasePath( 256 );
 -		userBasePath << userRoot << basegame << '/';
 +			userBasePath << homepath << basegame << '/';
- 			GlobalFileSystem().initDirectory( userBasePath.c_str() );
- 		}
+ 		GlobalFileSystem().initDirectory( userBasePath.c_str() );
+ 	}
 +	}
  
  	// <fs_basepath>/<fs_main>
  	if ( !g_disableEnginePath ) {
diff --cc radiant/texwindow.cpp
index f1cc83f5,72573afe..46f8c390
--- a/radiant/texwindow.cpp
+++ b/radiant/texwindow.cpp
@@@ -1598,9 -1546,9 +1600,9 @@@ gboolean TextureBrowser_button_press( u
  		}
  		#endif
  	}
- 	else if ( event->type == GDK_3BUTTON_PRESS ) {
+ 	else if ( event->type == GDK_2BUTTON_PRESS && event->button == 3 ) {
 -		ScopeDisableScreenUpdates disableScreenUpdates( TextureBrowser_getComonShadersDir(), "Loading Textures" );
 -		TextureBrowser_ShowDirectory( *textureBrowser, TextureBrowser_getComonShadersDir() );
 +		ScopeDisableScreenUpdates disableScreenUpdates( TextureBrowser_getCommonShadersDir(), "Loading Textures" );
 +		TextureBrowser_ShowDirectory( *textureBrowser, TextureBrowser_getCommonShadersDir() );
  		TextureBrowser_queueDraw( *textureBrowser );
  	}
  	return FALSE;