images/cmder
2
0
Fork 0
mirror of https://github.com/cmderdev/cmder.git synced 2025-11-29 18:19:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix_launcher_overwrite' into development-dax

Browse Source 
* fix_launcher_overwrite:
  origin/fix_launcher_overwrite
This commit is contained in:
Dax T. Games
2024-12-29 16:26:01 -05:00
parent 246711a67b ebce8479ef
commit b0d59c9846
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
launcher/src/CmderLauncher.cpp
View File

@@ -300,7 +300,7 @@ void StartCmder(std::wstring path = L"", bool is_single_mode = false, std::wstr
PathCombine(userCfgPath, userConfigDirPath, L"user-ConEmu.xml");
}
if ( PathFileExists(cpuCfgPath) || use_user_cfg == false ) // config/[cpu specific terminal emulator config] file exists or /m was specified on command line, use machine specific config.
if ( PathFileExists(cpuCfgPath) || use_user_cfg == false ) // config/[host specific terminal emulator config] file exists or /m was specified on command line, use machine specific config.
{
if (cfgRoot.length() == 0) // '/c [path]' was NOT specified
{
@@ -325,7 +325,7 @@ void StartCmder(std::wstring path = L"", bool is_single_mode = false, std::wstr
}
}
}
else // [terminal emulator config] file does not exist, copy config/[cpu specific terminal emulator config] file to [terminal emulator config] file
else // [terminal emulator config] file does not exist, copy config/[host specific terminal emulator config] file to [terminal emulator config] file
{
if (!CopyFile(cpuCfgPath, cfgPath, FALSE))
{