Merge branch 'master' into windows_terminal

This commit is contained in:
Dax T. Games
2023-11-10 17:02:47 -08:00
3 changed files with 7 additions and 10 deletions

View File

@ -575,9 +575,6 @@ void StartCmder(std::wstring path = L"", bool is_single_mode = false, std::wstr
}
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)