Adding config file path to path list where futher config files are searched

ef79550b · Dipl.-Ing. Jonas Stienen · 4f58a57d · ef79550b
Commit ef79550b authored Sep 21, 2018 by Dipl.-Ing. Jonas Stienen
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

src/VACoreImpl.cpp src/VACoreImpl.cpp +6 -0

No files found.
--- a/src/VACoreImpl.cpp
+++ b/src/VACoreImpl.cpp
@@ -200,8 +200,14 @@ void VACore::StoreCoreConfigToFile( const CVAStruct& oConfig, const std::string&
 CVAStruct VACore::LoadCoreConfigFromFile( const std::string& sConfigFilePath )
 {
 	CVAStruct oFinalCoreConfigStruct, oCurrentConfig;
+
+	VistaFileSystemFile oConfigFile( sConfigFilePath );
 	std::list< VistaFileSystemFile > voConfigFiles;
+	
 	std::vector< VistaFileSystemDirectory > voIncludePaths;
+	if( oConfigFile.Exists() && oConfigFile.GetParentDirectory().empty() == false )
+		voIncludePaths.push_back( oConfigFile.GetParentDirectory() );
+
 	voConfigFiles.push_back( VistaFileSystemFile( sConfigFilePath ) );

 	VA_INFO( "Core", "Working directory: '" << VistaFileSystemDirectory::GetCurrentWorkingDirectory() << "'" );