Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove "EFB Copies Disabled" option from hotkey toggling cycle. #971

Merged
merged 2 commits into from Sep 8, 2014
Merged

Remove "EFB Copies Disabled" option from hotkey toggling cycle. #971

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
18e13aa
Remove "EFB Copies Disabled" option from hotkey toggling cycle.
TurboK234 Sep 4, 2014
b7ecaf6
Added OSD comment if EFB Copies are disabled.
TurboK234 Sep 4, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions Source/Core/DolphinWX/Frame.cpp
View file
Open in desktop
Expand Up @@ -59,6 +59,7 @@

#include "InputCommon/GCPadStatus.h"

#include "VideoCommon/OnScreenDisplay.h"
#include "VideoCommon/RenderBase.h"
#include "VideoCommon/VertexShaderManager.h"
#include "VideoCommon/VideoConfig.h"
Expand Down Expand Up @@ -1013,11 +1014,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
{
Expand Down