diff options
| author | Matthew Parlane <parlane@gmail.com> | 2012-12-24 12:58:15 +1300 |
|---|---|---|
| committer | Matthew Parlane <parlane@gmail.com> | 2012-12-24 12:58:15 +1300 |
| commit | f6418bd09357a528bc495f6854512586d76f28c6 (patch) | |
| tree | ce7748e276363190022f766f4e2d3664712f7c58 /Source/Core/VideoCommon/Src/OnScreenDisplay.cpp | |
| parent | d9dd94ac8b696ceb0e6b32eaafcc302b41f43bd1 (diff) | |
| parent | eedca572702c7416805375bd652c56af8665d167 (diff) | |
Merge branch 'master' into wii-usb
Diffstat (limited to 'Source/Core/VideoCommon/Src/OnScreenDisplay.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/Src/OnScreenDisplay.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Source/Core/VideoCommon/Src/OnScreenDisplay.cpp b/Source/Core/VideoCommon/Src/OnScreenDisplay.cpp index f24bfc31b3..10cf5b84af 100644 --- a/Source/Core/VideoCommon/Src/OnScreenDisplay.cpp +++ b/Source/Core/VideoCommon/Src/OnScreenDisplay.cpp @@ -19,6 +19,7 @@ #include "Common.h" +#include "ConfigManager.h" #include "OnScreenDisplay.h" #include "RenderBase.h" #include "Timer.h" @@ -47,6 +48,8 @@ void AddMessage(const char* pstr, u32 ms) void DrawMessages() { + if(!SConfig::GetInstance().m_LocalCoreStartupParameter.bOnScreenDisplayMessages) return; + if (s_listMsgs.size() > 0) { int left = 25, top = 15; |