images/cmder
2
0
Fork 0
mirror of https://github.com/cmderdev/cmder.git synced 2025-11-04 03:12:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into windows_terminal

Browse Source
This commit is contained in:
Dax T. Games
2023-11-10 17:02:47 -08:00
parent 43a5e7e0b1 219c879582
commit 678b482269
3 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
launcher/src/CmderLauncher.cpp
View File

@@ -575,9 +575,6 @@ void StartCmder(std::wstring path = L"", bool is_single_mode = false, std::wstr
} }
return; return;
} }
LRESULT lr = SendMessageTimeout(HWND_BROADCAST, WM_SETTINGCHANGE, 0, (LPARAM)"Environment", SMTO_ABORTIFHUNG | SMTO_NOTIMEOUTIFNOTHUNG, 5000, NULL);
lr = SendMessageTimeout(HWND_BROADCAST, WM_SETTINGCHANGE, 0, (LPARAM)L"Environment", SMTO_ABORTIFHUNG | SMTO_NOTIMEOUTIFNOTHUNG, 5000, NULL); // For Windows >= 8
} }
bool IsUserOnly(std::wstring opt) bool IsUserOnly(std::wstring opt)

2
vendor/bin/cmder_shell.cmd vendored
View File

@@ -9,5 +9,5 @@ if "%cmder_init%" == "1" (
) )
pushd "%CMDER_ROOT%" pushd "%CMDER_ROOT%"
call "%CMDER_ROOT%\vendor\init.bat" /f call "%CMDER_ROOT%\vendor\init.bat" /f %*
popd popd

12
vendor/sources.json vendored
View File

@@ -6,13 +6,13 @@
}, },
{ {
"name": "git-for-windows", "name": "git-for-windows",
"version": "2.42.0.windows.2", "version": "2.43.0-rc0.windows.1",
"url": "https://github.com/git-for-windows/git/releases/download/v2.42.0.windows.2/PortableGit-2.42.0.2-64-bit.7z.exe" "url": "https://github.com/git-for-windows/git/releases/download/v2.43.0-rc0.windows.1/PortableGit-2.43.0-rc0-64-bit.7z.exe"
}, },
{ {
"name": "clink", "name": "clink",
"version": "1.5.6", "version": "1.5.12",
"url": "https://github.com/chrisant996/clink/releases/download/v1.5.6/clink.1.5.6.fc63d3.zip" "url": "https://github.com/chrisant996/clink/releases/download/v1.5.12/clink.1.5.12.c7156f.zip"
}, },
{ {
"name": "conemu-maximus5", "name": "conemu-maximus5",
@@ -21,7 +21,7 @@
}, },
{ {
"name": "clink-completions", "name": "clink-completions",
"version": "0.4.10", "version": "0.4.11",
"url": "https://github.com/vladimir-kotikov/clink-completions/archive/v0.4.10.zip" "url": "https://github.com/vladimir-kotikov/clink-completions/archive/v0.4.11.zip"
} }
] ]