From 16b3ba488d6923fc311f5495048c93f7afffacb1 Mon Sep 17 00:00:00 2001
From: sukibaby <163092272+sukibaby@users.noreply.github.com>
Date: Thu, 1 May 2025 01:47:31 -0700
Subject: [PATCH] SaveScreenshot: return the status boolean directly

Remake of PR #790 due to merge conflicts
---
 src/RageDisplay.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/RageDisplay.cpp b/src/RageDisplay.cpp
index d3e523f978..52208ad4ff 100644
--- a/src/RageDisplay.cpp
+++ b/src/RageDisplay.cpp
@@ -820,7 +820,10 @@ bool RageDisplay::SaveScreenshot( RString sPath, GraphicsFileFormat format )
 	case SAVE_LOSSY_HIGH_QUAL:
 		bSuccess = RageSurfaceUtils::SaveJPEG( surface, out, true );
 		break;
-	DEFAULT_FAIL( format );
+	default:
+		LOG->Warn("SaveScreenshot: Invalid graphics file format requested %d", format);
+		bSuccess = false;
+		break;
 	}
 //	LOG->Trace( "Saving Screenshot file took %f seconds.", timer.GetDeltaTime() );
 
@@ -829,10 +832,9 @@ bool RageDisplay::SaveScreenshot( RString sPath, GraphicsFileFormat format )
 	if( !bSuccess )
 	{
 		LOG->Warn("SaveScreenshot: Failed to save screenshot to %s: %s", sPath.c_str(), out.GetError().c_str() );
-		return false;
 	}
 
-	return true;
+	return bSuccess;
 }
 
 void RageDisplay::DrawQuads( const RageSpriteVertex v[], int iNumVerts )