From b067d48f6c8ab298e2ca50d9dac1aa290e4c2e1a Mon Sep 17 00:00:00 2001 From: Martin Kemp Date: Thu, 6 Nov 2014 11:48:00 +0000 Subject: [PATCH] Revert "Add single mode support." --- launcher/src/CmderLauncher.cpp | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/launcher/src/CmderLauncher.cpp b/launcher/src/CmderLauncher.cpp index 893e33c..fcdeb60 100644 --- a/launcher/src/CmderLauncher.cpp +++ b/launcher/src/CmderLauncher.cpp @@ -79,7 +79,7 @@ optpair GetOption() return pair; } -void StartCmder(std::wstring path, bool is_single_mode) +void StartCmder(std::wstring path) { #if USE_TASKBAR_API wchar_t appId[MAX_PATH] = { 0 }; @@ -102,14 +102,7 @@ void StartCmder(std::wstring path, bool is_single_mode) PathCombine(cfgPath, exeDir, L"config\\ConEmu.xml"); PathCombine(conEmuPath, exeDir, L"vendor\\conemu-maximus5\\ConEmu.exe"); - if (is_single_mode) - { - swprintf_s(args, L"/single /Icon \"%s\" /Title Cmder /LoadCfgFile \"%s\"", icoPath, cfgPath); - } - else - { - swprintf_s(args, L"/Icon \"%s\" /Title Cmder /LoadCfgFile \"%s\"", icoPath, cfgPath); - } + swprintf_s(args, L"/Icon \"%s\" /Title Cmder /LoadCfgFile \"%s\"", icoPath, cfgPath); SetEnvironmentVariable(L"CMDER_ROOT", exeDir); SetEnvironmentVariable(L"CMDER_START", path.c_str()); @@ -236,11 +229,7 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance, if (streqi(opt.first.c_str(), L"/START")) { - StartCmder(opt.second, false); - } - else if (streqi(opt.first.c_str(), L"/SINGLE")) - { - StartCmder(opt.second, true); + StartCmder(opt.second); } else if (streqi(opt.first.c_str(), L"/REGISTER")) { @@ -254,7 +243,7 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance, } else { - MessageBox(NULL, L"Unrecognized parameter.\n\nValid options:\n /START \n /SINGLE \n /REGISTER [USER/ALL]\n /UNREGISTER [USER/ALL]", MB_TITLE, MB_OK); + MessageBox(NULL, L"Unrecognized parameter.\n\nValid options:\n /START \n /REGISTER [USER/ALL]\n /UNREGISTER [USER/ALL]", MB_TITLE, MB_OK); return 1; }