Merge pull request #12142 from JosJuice/ir-hotkey-outdated

Use latest resolution value for resolution hotkey OSD
This commit is contained in:
Admiral H. Curtiss 2023-08-27 18:38:41 +02:00 committed by GitHub
commit 73859ff4c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -359,8 +359,8 @@ void HotkeyScheduler::Run()
// Graphics // Graphics
const auto efb_scale = Config::Get(Config::GFX_EFB_SCALE); const auto efb_scale = Config::Get(Config::GFX_EFB_SCALE);
auto ShowEFBScale = []() { const auto ShowEFBScale = [](int new_efb_scale) {
switch (Config::Get(Config::GFX_EFB_SCALE)) switch (new_efb_scale)
{ {
case EFB_SCALE_AUTO_INTEGRAL: case EFB_SCALE_AUTO_INTEGRAL:
OSD::AddMessage("Internal Resolution: Auto (integral)"); OSD::AddMessage("Internal Resolution: Auto (integral)");
@ -369,7 +369,7 @@ void HotkeyScheduler::Run()
OSD::AddMessage("Internal Resolution: Native"); OSD::AddMessage("Internal Resolution: Native");
break; break;
default: default:
OSD::AddMessage(fmt::format("Internal Resolution: {}x", g_Config.iEFBScale)); OSD::AddMessage(fmt::format("Internal Resolution: {}x", new_efb_scale));
break; break;
} }
}; };
@ -377,14 +377,14 @@ void HotkeyScheduler::Run()
if (IsHotkey(HK_INCREASE_IR)) if (IsHotkey(HK_INCREASE_IR))
{ {
Config::SetCurrent(Config::GFX_EFB_SCALE, efb_scale + 1); Config::SetCurrent(Config::GFX_EFB_SCALE, efb_scale + 1);
ShowEFBScale(); ShowEFBScale(efb_scale + 1);
} }
if (IsHotkey(HK_DECREASE_IR)) if (IsHotkey(HK_DECREASE_IR))
{ {
if (efb_scale > EFB_SCALE_AUTO_INTEGRAL) if (efb_scale > EFB_SCALE_AUTO_INTEGRAL)
{ {
Config::SetCurrent(Config::GFX_EFB_SCALE, efb_scale - 1); Config::SetCurrent(Config::GFX_EFB_SCALE, efb_scale - 1);
ShowEFBScale(); ShowEFBScale(efb_scale - 1);
} }
} }