Skip to content

Fix crash after #4119 #4136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 31, 2025
Merged

Fix crash after #4119 #4136

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b0d384
Source
Nico8340 Mar 31, 2025
1a02b19
Comments
Nico8340 Mar 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions Client/core/CCore.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1772,21 +1772,26 @@ void CCore::ApplyCoreInitSettings()
#if (_WIN32_WINNT >= _WIN32_WINNT_LONGHORN)
const auto aware = CVARS_GET_VALUE<bool>("process_dpi_aware");

// The minimum supported client for the function below is Windows Vista (Longhorn).
// For more information, refer to the Microsoft Learn article:
// https://learn.microsoft.com/en-us/windows/win32/hidpi/high-dpi-desktop-application-development-on-windows
if (aware)
SetProcessDPIAware();
#endif

const auto revision = GetApplicationSettingInt("reset-settings-revision");

if (revision >= 21486)
return;

const auto skin = CVARS_GET_VALUE<std::string>("current_skin");
// Users with the default skin will be switched to the 2023 version by replacing "Default" with "Default 2023".
// The "Default 2023" GUI skin was introduced in commit 2d9e03324b07e355031ecb3263477477f1a91399.
if (revision < 21486)
{
const auto skin = CVARS_GET_VALUE<std::string>("current_skin");

if (skin == "Default")
CVARS_SET("current_skin", "Default 2023");
if (skin == "Default")
CVARS_SET("current_skin", "Default 2023");

SetApplicationSettingInt("reset-settings-revision", 21486);
SetApplicationSettingInt("reset-settings-revision", 21486);
}

const auto process = GetCurrentProcess();
const int priorities[] = {NORMAL_PRIORITY_CLASS, ABOVE_NORMAL_PRIORITY_CLASS, HIGH_PRIORITY_CLASS};
Expand Down
Loading