From bd0d3ba6d323482596589c6d326089346736fc99 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sun, 12 Mar 2017 22:54:58 -0700 Subject: [PATCH 1/2] Disable Take Screenshot while not in game. Since #9284, we don't support it anymore, and 37646d6 added an error log for the operation. Let's also disable the menu item. --- Windows/MainWindowMenu.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Windows/MainWindowMenu.cpp b/Windows/MainWindowMenu.cpp index c1c7dd3228..7fae7c50b1 100644 --- a/Windows/MainWindowMenu.cpp +++ b/Windows/MainWindowMenu.cpp @@ -66,8 +66,9 @@ namespace MainWindow { EnableMenuItem(menu, ID_DEBUG_LOADSYMFILE, menuEnable); EnableMenuItem(menu, ID_DEBUG_SAVESYMFILE, menuEnable); EnableMenuItem(menu, ID_DEBUG_RESETSYMBOLTABLE, menuEnable); - EnableMenuItem(menu, ID_DEBUG_EXTRACTFILE, menuEnable); + EnableMenuItem(menu, ID_DEBUG_TAKESCREENSHOT, menuEnable); EnableMenuItem(menu, ID_DEBUG_SHOWDEBUGSTATISTICS, menuEnable); + EnableMenuItem(menu, ID_DEBUG_EXTRACTFILE, menuEnable); // While playing, this pop up doesn't work - and probably doesn't make sense. EnableMenuItem(menu, ID_OPTIONS_LANGUAGE, state == UISTATE_INGAME ? MF_GRAYED : MF_ENABLED); From 5c6ae0e2e9826bd83364e9f72d44faf3ce38ccf7 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sun, 12 Mar 2017 23:00:12 -0700 Subject: [PATCH 2/2] Correct a log format warning. --- GPU/Directx9/FramebufferDX9.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GPU/Directx9/FramebufferDX9.cpp b/GPU/Directx9/FramebufferDX9.cpp index 4318026c3b..dd607d70d7 100644 --- a/GPU/Directx9/FramebufferDX9.cpp +++ b/GPU/Directx9/FramebufferDX9.cpp @@ -626,7 +626,7 @@ static const D3DVERTEXELEMENT9 g_FramebufferVertexElements[] = { dst->fbo, dstX1, dstY1, dstX2, dstY2, Draw::FB_COLOR_BIT, Draw::FB_BLIT_NEAREST); if (!result) { - ERROR_LOG_REPORT(G3D, "fbo_blit_color failed in blit: %08x (%08x -> %08x)", src->fb_address, dst->fb_address); + ERROR_LOG_REPORT(G3D, "fbo_blit_color failed in blit (%08x -> %08x)", src->fb_address, dst->fb_address); } }