Merge pull request #1971 from cmderdev/fix_1.3.9

daxgames · web-flow · commit 3163d6d1c3b8 · 2018-11-30T15:00:35.000-06:00
fix initial launch of cmder starting with conemu default cfg
diff --git a/launcher/src/CmderLauncher.cpp b/launcher/src/CmderLauncher.cpp
@@ -319,6 +319,16 @@ void StartCmder(std::wstring  path = L"", bool is_single_mode = false, std::wstr
 				}
 			}
 		}
+		else {
+			if (!CopyFile(defaultCfgPath, cfgPath, FALSE))
+			{
+				MessageBox(NULL,
+					(GetLastError() == ERROR_ACCESS_DENIED)
+					? L"Failed to copy vendor/ConEmu.xml.default file to vendor/conemu-maximus5/ConEmu.xml! Access Denied."
+					: L"Failed to copy vendor/ConEmu.xml.default file to vendor/conemu-maximus5/ConEmu.xml!", MB_TITLE, MB_ICONSTOP);
+				exit(1);
+			}
+		}
 	}
 	else if (PathFileExists(cfgPath)) // vendor/conemu-maximus5/ConEmu.xml exists, copy vendor/conemu-maximus5/ConEmu.xml to config/user_conemu.xml
 	{

Original file line number	Diff line number	Diff line change
`@@ -319,6 +319,16 @@ void StartCmder(std::wstring path = L"", bool is_single_mode = false, std::wstr`
`319`	`319`	`}`
`320`	`320`	`}`
`321`	`321`	`}`
	`322`	`+ else {`
	`323`	`+ if (!CopyFile(defaultCfgPath, cfgPath, FALSE))`
	`324`	`+ {`
	`325`	`+ MessageBox(NULL,`
	`326`	`+ (GetLastError() == ERROR_ACCESS_DENIED)`
	`327`	`+ ? L"Failed to copy vendor/ConEmu.xml.default file to vendor/conemu-maximus5/ConEmu.xml! Access Denied."`
	`328`	`+ : L"Failed to copy vendor/ConEmu.xml.default file to vendor/conemu-maximus5/ConEmu.xml!", MB_TITLE, MB_ICONSTOP);`
	`329`	`+ exit(1);`
	`330`	`+ }`
	`331`	`+ }`
`322`	`332`	`}`
`323`	`333`	`else if (PathFileExists(cfgPath)) // vendor/conemu-maximus5/ConEmu.xml exists, copy vendor/conemu-maximus5/ConEmu.xml to config/user_conemu.xml`
`324`	`334`	`{`