From b60d7c4e8dac70e1214d6ace47a492cc3e4ac8cc Mon Sep 17 00:00:00 2001 From: NKR0ne Date: Sat, 25 Jul 2026 08:40:46 -0400 Subject: [PATCH] gui: fix TV and GamePad screenshot filenames being swapped GenerateScreenshotFilename takes isDRC, but SaveScreenshot passes mainWindow, which is its exact inverse (VulkanRenderer::HandleScreenshotRequest passes !padView as mainWindow). The result is that TV screenshots are saved with the _GamePad suffix and GamePad screenshots are saved without it. Only the filename is affected, the image content is correct. Co-Authored-By: Claude Opus 5 --- src/gui/wxgui/input/HotkeySettings.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/gui/wxgui/input/HotkeySettings.cpp b/src/gui/wxgui/input/HotkeySettings.cpp index d84ffa1b..8f79f2d4 100644 --- a/src/gui/wxgui/input/HotkeySettings.cpp +++ b/src/gui/wxgui/input/HotkeySettings.cpp @@ -99,7 +99,9 @@ std::optional SaveScreenshot(std::vector data, int width, in } if (save_screenshot) { - auto imagePath = GenerateScreenshotFilename(mainWindow); + // GenerateScreenshotFilename takes isDRC, which is the opposite of mainWindow. Passing + // mainWindow directly gave TV captures the _GamePad suffix and GamePad captures none + auto imagePath = GenerateScreenshotFilename(!mainWindow); if (imagePath.has_value() && SaveScreenshotToFile(imagePath.value(), image)) { if (mainWindow)