Merge remote-tracking branch 'upstream/master'

daxgames · daxgames · commit 219c87958268 · 2023-11-10T17:00:16.000-08:00
diff --git a/launcher/src/CmderLauncher.cpp b/launcher/src/CmderLauncher.cpp
@@ -469,9 +469,6 @@ void StartCmder(std::wstring  path = L"", bool is_single_mode = false, std::wstr
 		MessageBox(NULL, _T("Unable to create the ConEmu process!"), _T("Error"), MB_OK);
 		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)

Original file line number	Diff line number	Diff line change
`@@ -469,9 +469,6 @@ void StartCmder(std::wstring path = L"", bool is_single_mode = false, std::wstr`
`469`	`469`	`MessageBox(NULL, _T("Unable to create the ConEmu process!"), _T("Error"), MB_OK);`
`470`	`470`	`return;`
`471`	`471`	`}`
`472`		`-`
`473`		`- LRESULT lr = SendMessageTimeout(HWND_BROADCAST, WM_SETTINGCHANGE, 0, (LPARAM)"Environment", SMTO_ABORTIFHUNG \| SMTO_NOTIMEOUTIFNOTHUNG, 5000, NULL);`
`474`		`- lr = SendMessageTimeout(HWND_BROADCAST, WM_SETTINGCHANGE, 0, (LPARAM)L"Environment", SMTO_ABORTIFHUNG \| SMTO_NOTIMEOUTIFNOTHUNG, 5000, NULL); // For Windows >= 8`
`475`	`472`	`}`
`476`	`473`
`477`	`474`	`bool IsUserOnly(std::wstring opt)`