System: Reduce force-displayed-warning scope

Please don't make me regret this.
This commit is contained in:
Stenzek 2024-09-10 23:53:39 +10:00
parent 9de8bf9da5
commit 338fb278e8
No known key found for this signature in database

View file

@ -4546,7 +4546,7 @@ void System::WarnAboutUnsafeSettings()
LargeString messages; LargeString messages;
auto append = [&messages](const char* icon, std::string_view msg) { messages.append_format("{} {}\n", icon, msg); }; auto append = [&messages](const char* icon, std::string_view msg) { messages.append_format("{} {}\n", icon, msg); };
if (!g_settings.disable_all_enhancements) if (!g_settings.disable_all_enhancements && ImGuiManager::IsShowingOSDMessages())
{ {
if (g_settings.cpu_overclock_active) if (g_settings.cpu_overclock_active)
{ {
@ -4595,7 +4595,8 @@ void System::WarnAboutUnsafeSettings()
TRANSLATE_SV("System", "8MB RAM is enabled, this may be incompatible with some games.")); TRANSLATE_SV("System", "8MB RAM is enabled, this may be incompatible with some games."));
} }
} }
else
if (g_settings.disable_all_enhancements)
{ {
append(ICON_EMOJI_WARNING, TRANSLATE_SV("System", "All enhancements are currently disabled.")); append(ICON_EMOJI_WARNING, TRANSLATE_SV("System", "All enhancements are currently disabled."));