Added code to check for the existence of a customized ini file named …

…`ConEmu-%COMPUTERNAME%.ini`, before checking for the standard ini file `ConEmu.ini`.
cmderdev · Mar 17, 2015 · 1871564 · daxgames · Dec 14, 2015 · 1871564
1 parent df4e83d
commit 1871564
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/launcher/src/CmderLauncher.cpp b/launcher/src/CmderLauncher.cpp
@@ -99,7 +99,11 @@ void StartCmder(std::wstring path, bool is_single_mode)
 	PathRemoveFileSpec(exeDir);
 
 	PathCombine(icoPath, exeDir, L"icons\\cmder.ico");
-	PathCombine(cfgPath, exeDir, L"config\\ConEmu.xml");
+	PathCombine(cfgPath, exeDir, L"config\\ConEmu-%COMPUTERNAME%.xml");
+	ExpandEnvironmentStrings(cfgPath, cfgPath, sizeof(cfgPath) / sizeof(cfgPath[0]));
+	if (!PathFileExists(cfgPath)) {
+		PathCombine(cfgPath, exeDir, L"config\\ConEmu.xml");
+	}
 	PathCombine(conEmuPath, exeDir, L"vendor\\conemu-maximus5\\ConEmu.exe");
 
 	if (is_single_mode)