Merge branch 'main' into Version2

mnoomnoo · mnoomnoo · commit b0a6caa0361d · 2023-04-30T20:59:18.000-07:00
diff --git a/src/ProgramArgs.cpp b/src/ProgramArgs.cpp
@@ -70,7 +70,8 @@ bool ProcessProgramArgs(int argc , const char** argv, ProgramCmdLineOptions& pro
 
 		if(hasExeConfigs)
 		{		
-			const std::string exeConfPath = std::filesystem::current_path().string() + "\\" + "exesConfig.ecfg";
+			const std::filesystem::path exePath = argv[0];			
+			const std::string exeConfPath = exePath.parent_path().string() + "\\" + "exesConfig.ecfg";
 			std::ifstream file(exeConfPath);
 			if (file.is_open())
 			{

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,8 @@ bool ProcessProgramArgs(int argc , const char** argv, ProgramCmdLineOptions& pro`
`70`	`70`
`71`	`71`	`if(hasExeConfigs)`
`72`	`72`	`{`
`73`		`- const std::string exeConfPath = std::filesystem::current_path().string() + "\\" + "exesConfig.ecfg";`
	`73`	`+ const std::filesystem::path exePath = argv[0];`
	`74`	`+ const std::string exeConfPath = exePath.parent_path().string() + "\\" + "exesConfig.ecfg";`
`74`	`75`	`std::ifstream file(exeConfPath);`
`75`	`76`	`if (file.is_open())`
`76`	`77`	`{`