From 013a51576af104c0283ace1ce51a0d8a1ef5b15f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= <hrydgard@gmail.com>
Date: Mon, 9 Feb 2026 14:32:30 +0100
Subject: [PATCH] Fix screenshotting and the background of ReportScreen

See #21223
---
 UI/ReportScreen.cpp | 52 ++++++++++++++++-----------------------------
 UI/ReportScreen.h   |  5 +----
 2 files changed, 19 insertions(+), 38 deletions(-)

diff --git a/UI/ReportScreen.cpp b/UI/ReportScreen.cpp
index 15f8f780d7..f3dec1ce9e 100644
--- a/UI/ReportScreen.cpp
+++ b/UI/ReportScreen.cpp
@@ -166,43 +166,27 @@ ReportScreen::ReportScreen(const Path &gamePath)
 	Reporting::QueueCRC(gamePath_);
 }
 
-ScreenRenderFlags ReportScreen::render(ScreenRenderMode mode) {
-	_dbg_assert_(mode & ScreenRenderMode::FIRST);
-	// _dbg_assert_(mode & ScreenRenderMode::TOP);
-
-	if (mode & ScreenRenderMode::TOP) {
-		// We do this after render because we need it to be within the frame (so the screenshot works).
+ScreenRenderFlags ReportScreen::PreRender(ScreenRenderMode mode) {
+	if ((mode & ScreenRenderMode::TOP) && !tookScreenshot_ && !g_Config.bSkipBufferEffects) {
+		// We do this in PreRender because we need it to be before the main render pass.
 		// We could do it mid frame, but then we have to reapply viewport/scissor.
-		if (!tookScreenshot_ && !g_Config.bSkipBufferEffects) {
-			Path path = GetSysDirectory(DIRECTORY_SCREENSHOT);
-			if (!File::Exists(path)) {
-				File::CreateDir(path);
-			}
-			screenshotFilename_ = path / ".reporting.jpg";
-			ScreenshotResult ignored = TakeGameScreenshot(screenManager()->getDrawContext(), screenshotFilename_, ScreenshotFormat::JPG, SCREENSHOT_RENDER, 4, [this](bool success) {
-				if (success) {
-					// Redo the views already, now with a screenshot included.
-					RecreateViews();
-				} else {
-					// Good news (?), the views are good as-is without a screenshot.
-					screenshotFilename_.clear();
-				}
-			});
-			tookScreenshot_ = true;
+		Path path = GetSysDirectory(DIRECTORY_SCREENSHOT);
+		if (!File::Exists(path)) {
+			File::CreateDir(path);
 		}
+		screenshotFilename_ = path / ".reporting.jpg";
+		ScreenshotResult ignored = TakeGameScreenshot(screenManager()->getDrawContext(), screenshotFilename_, ScreenshotFormat::JPG, SCREENSHOT_RENDER, 4, [this](bool success) {
+			if (success) {
+				// Redo the views already, now with a screenshot included.
+				RecreateViews();
+			} else {
+				// Good news (?), the views are good as-is without a screenshot.
+				screenshotFilename_.clear();
+			}
+		});
+		tookScreenshot_ = true;
 	}
-
-	// We take the screenshot first, then we start rendering.
-	// We are the only screen visible so this avoid starting and then trying to resume a backbuffer render pass.
-	return UITwoPaneBaseDialogScreen::render(mode);
-}
-
-// For the screenshotting functionality to work.
-ScreenRenderRole ReportScreen::renderRole(bool isTop) const {
-	// if (tookScreenshot_) {
-	// 	return ScreenRenderRole::NONE;
-	// }
-	return ScreenRenderRole::MUST_BE_FIRST | ScreenRenderRole::CAN_BE_BACKGROUND;
+	return ScreenRenderFlags::NONE;
 }
 
 void ReportScreen::update() {
diff --git a/UI/ReportScreen.h b/UI/ReportScreen.h
index 4e0d359d00..e5ef6db2b3 100644
--- a/UI/ReportScreen.h
+++ b/UI/ReportScreen.h
@@ -40,11 +40,8 @@ public:
 
 	const char *tag() const override { return "Report"; }
 
-	// For the screenshotting functionality to work.
-	ScreenRenderRole renderRole(bool isTop) const override;
-
 protected:
-	ScreenRenderFlags render(ScreenRenderMode mode) override;
+	ScreenRenderFlags PreRender(ScreenRenderMode mode) override;
 	void update() override;
 	void resized() override;
 	void CreateSettingsViews(UI::ViewGroup *parent) override;