diff options
| author | skidau <skidau@gmail.com> | 2014-09-08 17:05:52 +1000 |
|---|---|---|
| committer | skidau <skidau@gmail.com> | 2014-09-08 17:05:52 +1000 |
| commit | dae162c2b5148d3f850f8a64a58c362b7d18e2ff (patch) | |
| tree | 909cf0461f12b4da43af61c7f5d26ec3431f776d /Source/Core | |
| parent | 7fb6628789e904fb8cd1a90c0e261b6da8cfa7be (diff) | |
| parent | b7ecaf611153bdb2f357785e2e9e56454f408d47 (diff) | |
Merge pull request #971 from TurboK234/EFB_copies_togglefix
Remove "EFB Copies Disabled" option from hotkey toggling cycle.
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/DolphinWX/Frame.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp index 7114391bb6..5213497e2c 100644 --- a/Source/Core/DolphinWX/Frame.cpp +++ b/Source/Core/DolphinWX/Frame.cpp @@ -59,6 +59,7 @@ #include "InputCommon/GCPadStatus.h" +#include "VideoCommon/OnScreenDisplay.h" #include "VideoCommon/RenderBase.h" #include "VideoCommon/VertexShaderManager.h" #include "VideoCommon/VideoConfig.h" @@ -1022,11 +1023,10 @@ void CFrame::OnKeyDown(wxKeyEvent& event) else if (IsHotkey(event, HK_TOGGLE_EFBCOPIES)) { OSDChoice = 3; - // Toggle EFB copy - if (!g_Config.bEFBCopyEnable || g_Config.bCopyEFBToTexture) + // Toggle EFB copies between EFB2RAM and EFB2Texture + if (!g_Config.bEFBCopyEnable) { - g_Config.bEFBCopyEnable ^= true; - g_Config.bCopyEFBToTexture = false; + OSD::AddMessage("EFB Copies are disabled, enable them in Graphics settings for toggling", 6000); } else { |