diff options
| author | LC <mathew1800@gmail.com> | 2020-09-07 22:37:46 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-07 22:37:46 -0400 |
| commit | b350cf043bfeda0cf4ef36d90603306dd56f5924 (patch) | |
| tree | 669ef9e5797af2cada72af8189c3d178286d7362 /Source/Core/VideoCommon/OnScreenDisplay.cpp | |
| parent | fa91b47863855f2b098162e9a97740efcb9653ef (diff) | |
| parent | b0f9bb9f136053c3fb164704e4d34a0ab0dd5dea (diff) | |
Merge pull request #8976 from JosJuice/port-some-settings
Port some settings to the new config system
Diffstat (limited to 'Source/Core/VideoCommon/OnScreenDisplay.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/OnScreenDisplay.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/Core/VideoCommon/OnScreenDisplay.cpp b/Source/Core/VideoCommon/OnScreenDisplay.cpp index 359e17ebb0..e08bfb0970 100644 --- a/Source/Core/VideoCommon/OnScreenDisplay.cpp +++ b/Source/Core/VideoCommon/OnScreenDisplay.cpp @@ -13,9 +13,10 @@ #include <imgui.h> #include "Common/CommonTypes.h" +#include "Common/Config/Config.h" #include "Common/Timer.h" -#include "Core/ConfigManager.h" +#include "Core/Config/MainSettings.h" namespace OSD { @@ -94,7 +95,7 @@ void AddMessage(std::string message, u32 ms, u32 argb) void DrawMessages() { - const bool draw_messages = SConfig::GetInstance().bOnScreenDisplayMessages; + const bool draw_messages = Config::Get(Config::MAIN_OSD_MESSAGES); const u32 now = Common::Timer::GetTimeMs(); const float current_x = LEFT_MARGIN * ImGui::GetIO().DisplayFramebufferScale.x; float current_y = TOP_MARGIN * ImGui::GetIO().DisplayFramebufferScale.y; |