From 18e13aacf7e5da5bfd180921681dda4dc4a415c2 Mon Sep 17 00:00:00 2001 From: TurboK234 Date: Fri, 5 Sep 2014 00:12:04 +0300 Subject: [PATCH 1/2] Remove "EFB Copies Disabled" option from hotkey toggling cycle. --- Source/Core/DolphinWX/Frame.cpp | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp index 7885986fb2..8adb5bcdcc 100644 --- a/Source/Core/DolphinWX/Frame.cpp +++ b/Source/Core/DolphinWX/Frame.cpp @@ -1013,16 +1013,8 @@ void CFrame::OnKeyDown(wxKeyEvent& event) else if (IsHotkey(event, HK_TOGGLE_EFBCOPIES)) { OSDChoice = 3; - // Toggle EFB copy - if (!g_Config.bEFBCopyEnable || g_Config.bCopyEFBToTexture) - { - g_Config.bEFBCopyEnable ^= true; - g_Config.bCopyEFBToTexture = false; - } - else - { - g_Config.bCopyEFBToTexture = !g_Config.bCopyEFBToTexture; - } + // Toggle EFB copies between EFB2RAM and EFB2Texture + g_Config.bCopyEFBToTexture = !g_Config.bCopyEFBToTexture; } else if (IsHotkey(event, HK_TOGGLE_FOG)) { From b7ecaf611153bdb2f357785e2e9e56454f408d47 Mon Sep 17 00:00:00 2001 From: TurboK234 Date: Fri, 5 Sep 2014 01:42:40 +0300 Subject: [PATCH 2/2] Added OSD comment if EFB Copies are disabled. --- Source/Core/DolphinWX/Frame.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp index 8adb5bcdcc..397f8df5a9 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" @@ -1014,7 +1015,14 @@ void CFrame::OnKeyDown(wxKeyEvent& event) { OSDChoice = 3; // Toggle EFB copies between EFB2RAM and EFB2Texture - g_Config.bCopyEFBToTexture = !g_Config.bCopyEFBToTexture; + if (!g_Config.bEFBCopyEnable) + { + OSD::AddMessage("EFB Copies are disabled, enable them in Graphics settings for toggling", 6000); + } + else + { + g_Config.bCopyEFBToTexture = !g_Config.bCopyEFBToTexture; + } } else if (IsHotkey(event, HK_TOGGLE_FOG)) {