Oct 14, 2022 · Jun 24, 2020 · Jun 24, 2020 · Jul 18, 2022 · Jul 18, 2022 · Jul 18, 2022
diff --git a/launcher/src/CmderLauncher.cpp b/launcher/src/CmderLauncher.cpp
 return false;
 }

 void StartCmder(std::wstring  path = L"", bool is_single_mode = false, std::wstring taskName = L"", std::wstring iconPath = L"", std::wstring cfgRoot = L"", bool use_user_cfg = true, std::wstring conemu_args = L"")
 void StartCmder(std::wstring  path = L"", bool is_single_mode = false, std::wstring taskName = L"", std::wstringtitle = L"", std::wstringiconPath = L"", std::wstring cfgRoot = L"", bool use_user_cfg = true, std::wstring conemu_args = L"")
 {
 #if USE_TASKBAR_API
 wchar_t appId[MAX_PATH] = { 0 };

 std::wstring cmderStart = path;
 std::wstring cmderTask = taskName;
 std::wstring cmderTitle = title;
 std::wstring cmderConEmuArgs = conemu_args;

 std::copy(cfgRoot.begin(), cfgRoot.end(), userConfigDirPath);
 PathCombine(conEmuPath, exeDir, L"vendor\\conemu-maximus5\\ConEmu.exe");
 }

 swprintf_s(args, L"%s /Icon \"%s\" /Title Cmder", args, icoPath);
 swprintf_s(args, L"%s /Icon \"%s\"", args, icoPath);

 if (!streqi(cmderStart.c_str(), L""))
 {
 swprintf_s(args, L"%s /run {%s}", args, cmderTask.c_str());
 }

 if (!streqi(cmderTitle.c_str(), L""))
 {
 swprintf_s(args, L"%s /title \"%s\"", args, cmderTitle.c_str());
 }

 if (cfgRoot.length() != 0)
 {
 swprintf_s(args, L"%s  -loadcfgfile \"%s\"", args, userConEmuCfgPath);
 std::wstring cmderCfgRoot = L"";
 std::wstring cmderStart = L"";
 std::wstring cmderTask = L"";
 std::wstring cmderTitle = L"Cmder";
 std::wstring cmderIcon = L"";
 std::wstring cmderRegScope = L"USER";
 std::wstring cmderConEmuArgs = L"";
 cmderOptions.cmderTask = szArgList[i + 1];
 i++;
 }
 else if (_wcsicmp(L"/title", szArgList[i]) == 0)
 {
 cmderOptions.cmderTitle = szArgList[i + 1];
 i++;
 }
 else if (_wcsicmp(L"/icon", szArgList[i]) == 0)
 {
 cmderOptions.cmderIcon = szArgList[i + 1];
 }
 else
 {
 StartCmder(cmderOptions.cmderStart, cmderOptions.cmderSingle, cmderOptions.cmderTask, cmderOptions.cmderIcon, cmderOptions.cmderCfgRoot, cmderOptions.cmderUserCfg, cmderOptions.cmderConEmuArgs);
 StartCmder(cmderOptions.cmderStart, cmderOptions.cmderSingle, cmderOptions.cmderTask, cmderOptions.cmderTitle, cmderOptions.cmderIcon, cmderOptions.cmderCfgRoot, cmderOptions.cmderUserCfg, cmderOptions.cmderConEmuArgs);
 }

 return 0;
 }
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -105,7 +105,7 @@ bool FileExists(const wchar_t * filePath)
		return false;
		}

		void StartCmder(std::wstring path = L"", bool is_single_mode = false, std::wstring taskName = L"", std::wstring iconPath = L"", std::wstring cfgRoot = L"", bool use_user_cfg = true, std::wstring conemu_args = L"")
		void StartCmder(std::wstring path = L"", bool is_single_mode = false, std::wstring taskName = L"", std::wstringtitle = L"", std::wstringiconPath = L"", std::wstring cfgRoot = L"", bool use_user_cfg = true, std::wstring conemu_args = L"")
		{
		#if USE_TASKBAR_API
		wchar_t appId[MAX_PATH] = { 0 };
Expand All		@@ -132,6 +132,7 @@ void StartCmder(std::wstring path = L"", bool is_single_mode = false, std::wstr

		std::wstring cmderStart = path;
		std::wstring cmderTask = taskName;
		std::wstring cmderTitle = title;
		std::wstring cmderConEmuArgs = conemu_args;

		std::copy(cfgRoot.begin(), cfgRoot.end(), userConfigDirPath);
Expand DownExpand Up		@@ -412,7 +413,7 @@ void StartCmder(std::wstring path = L"", bool is_single_mode = false, std::wstr
		PathCombine(conEmuPath, exeDir, L"vendor\\conemu-maximus5\\ConEmu.exe");
		}

		swprintf_s(args, L"%s /Icon \"%s\" /Title Cmder", args, icoPath);
		swprintf_s(args, L"%s /Icon \"%s\"", args, icoPath);

		if (!streqi(cmderStart.c_str(), L""))
		{
Expand All		@@ -429,6 +430,11 @@ void StartCmder(std::wstring path = L"", bool is_single_mode = false, std::wstr
		swprintf_s(args, L"%s /run {%s}", args, cmderTask.c_str());
		}

		if (!streqi(cmderTitle.c_str(), L""))
		{
		swprintf_s(args, L"%s /title \"%s\"", args, cmderTitle.c_str());
		}

		if (cfgRoot.length() != 0)
		{
		swprintf_s(args, L"%s -loadcfgfile \"%s\"", args, userConEmuCfgPath);
Expand DownExpand Up		@@ -574,6 +580,7 @@ struct cmderOptions
		std::wstring cmderCfgRoot = L"";
		std::wstring cmderStart = L"";
		std::wstring cmderTask = L"";
		std::wstring cmderTitle = L"Cmder";
		std::wstring cmderIcon = L"";
		std::wstring cmderRegScope = L"USER";
		std::wstring cmderConEmuArgs = L"";
Expand DownExpand Up		@@ -636,6 +643,11 @@ cmderOptions GetOption()
		cmderOptions.cmderTask = szArgList[i + 1];
		i++;
		}
		else if (_wcsicmp(L"/title", szArgList[i]) == 0)
		{
		cmderOptions.cmderTitle = szArgList[i + 1];
		i++;
		}
		else if (_wcsicmp(L"/icon", szArgList[i]) == 0)
		{
		cmderOptions.cmderIcon = szArgList[i + 1];
Expand DownExpand Up		@@ -764,8 +776,8 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
		}
		else
		{
		StartCmder(cmderOptions.cmderStart, cmderOptions.cmderSingle, cmderOptions.cmderTask, cmderOptions.cmderIcon, cmderOptions.cmderCfgRoot, cmderOptions.cmderUserCfg, cmderOptions.cmderConEmuArgs);
		StartCmder(cmderOptions.cmderStart, cmderOptions.cmderSingle, cmderOptions.cmderTask, cmderOptions.cmderTitle, cmderOptions.cmderIcon, cmderOptions.cmderCfgRoot, cmderOptions.cmderUserCfg, cmderOptions.cmderConEmuArgs);
		}

		return 0;
		}
		}