actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix memory leak if screenshot fails.

Browse Source
This commit is contained in:
Steve Checkoway
2006-09-16 03:04:04 +00:00
parent 2cf71907ee
commit 5265df4393
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageDisplay.cpp
+4 -6
View File
@@ -718,7 +718,7 @@ void RageDisplay::UpdateCentering()
bool RageDisplay::SaveScreenshot( RString sPath, GraphicsFileFormat format ) bool RageDisplay::SaveScreenshot( RString sPath, GraphicsFileFormat format )
{ {
RageSurface* surface = this->CreateScreenshot(); RageSurface *surface = this->CreateScreenshot();
/* Unless we're in lossless, resize the image to 640x480. If we're saving lossy, /* Unless we're in lossless, resize the image to 640x480. If we're saving lossy,
* there's no sense in saving 1280x960 screenshots, and we don't want to output * there's no sense in saving 1280x960 screenshots, and we don't want to output
@@ -736,6 +736,7 @@ bool RageDisplay::SaveScreenshot( RString sPath, GraphicsFileFormat format )
if( !out.Open( sPath, RageFile::WRITE ) ) if( !out.Open( sPath, RageFile::WRITE ) )
{ {
LOG->Trace("Couldn't write %s: %s", sPath.c_str(), out.GetError().c_str() ); LOG->Trace("Couldn't write %s: %s", sPath.c_str(), out.GetError().c_str() );
SAFE_DELETE( surface );
return false; return false;
} }
@@ -751,13 +752,10 @@ bool RageDisplay::SaveScreenshot( RString sPath, GraphicsFileFormat format )
case SAVE_LOSSY_HIGH_QUAL: case SAVE_LOSSY_HIGH_QUAL:
bSuccess = RageSurfaceUtils::SaveJPEG( surface, out, true ); bSuccess = RageSurfaceUtils::SaveJPEG( surface, out, true );
break; break;
default: DEFAULT_FAIL( format );
ASSERT(0);
return false;
} }
delete surface; SAFE_DELETE( surface );
surface = NULL;
if( !bSuccess ) if( !bSuccess )
{ {