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

Merge commit 'b681f28130ff2e9789253eff1c1d41163e427eaa' into master-merge
---

b697f9ada5c6ef01411552d9ddbd2e47ecb243a3
diff --cc radiant/mainframe.cpp
index 1bea47d1,6f377579..84ab042c
--- a/radiant/mainframe.cpp
+++ b/radiant/mainframe.cpp
@@@ -3680,15 -3532,12 +3685,14 @@@ void MainFrame_Construct()
  #error "unknown platform"
  #endif
  		;
 +
  		StringOutputStream path( 256 );
  		path << DirectoryCleaned( g_pGameDescription->getRequiredKeyValue( ENGINEPATH_ATTRIBUTE ) );
 -		g_strEnginePath = path.c_str();
 +
 +		g_strEnginePath = transformPath( path.c_str() ).c_str();
+ 		GlobalPreferenceSystem().registerPreference( "EnginePath", make_property_string( g_strEnginePath ) );
  	}
  
- 	GlobalPreferenceSystem().registerPreference( "EnginePath", make_property_string( g_strEnginePath ) );
- 
  	GlobalPreferenceSystem().registerPreference( "DisableEnginePath", make_property_string( g_disableEnginePath ) );
  	GlobalPreferenceSystem().registerPreference( "DisableHomePath", make_property_string( g_disableHomePath ) );