Skip to content

gui: fix TV and GamePad screenshot filenames being swapped #2009

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

Open
NKR0ne wants to merge 1 commit into
base: main
Choose a base branch
from
+3 −1
Open

gui: fix TV and GamePad screenshot filenames being swapped #2009

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/gui/wxgui/input/HotkeySettings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,9 @@ std::optional<std::string> SaveScreenshot(std::vector<uint8> 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
Comment on lines +102 to +103

@goeiecool9999 goeiecool9999 Jul 25, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IMO there's no need to leave about problems that were fixed

auto imagePath = GenerateScreenshotFilename(!mainWindow);
if (imagePath.has_value() && SaveScreenshotToFile(imagePath.value(), image))
{
if (mainWindow)
Expand Down