MaskBuffer and PathBuffer are now correctly freed before they are deallocated, and so is background Surface.

svn-id: r28483

1 files changed, 13 insertions, 5 deletions

diff --git a/engines/parallaction/graphics.cpp b/engines/parallaction/graphics.cpp
index e948fa7f26..5c31c87d7a 100644
--- a/engines/parallaction/graphics.cpp
+++ b/engines/parallaction/graphics.cpp
@@ -772,16 +772,20 @@ void Gfx::freeStaticCnv(StaticCnv *cnv) {
 
 
 void Gfx::setBackground(Graphics::Surface *surface) {
-	if (_buffers[kBit2])
+	if (_buffers[kBit2]) {
+		_buffers[kBit2]->free();
 		delete _buffers[kBit2];
+	}
 
 	_buffers[kBit2] = surface;
 	copyScreen(kBit2, kBitBack);
 }
 
 void Gfx::setMask(MaskBuffer *buffer) {
-	if (_depthMask)
+	if (_depthMask) {
+		_depthMask->free();
 		delete _depthMask;
+	}
 
 	_depthMask = buffer;
 }
@@ -893,16 +897,20 @@ Gfx::Gfx(Parallaction* vm) :
 
 Gfx::~Gfx() {
 
-	_depthMask->free();
-	delete _depthMask;
+	if (_depthMask) {
+		_depthMask->free();
+		delete _depthMask;
+	}
 
 	_buffers[kBitFront]->free();
 	delete _buffers[kBitFront];
 	_buffers[kBitBack]->free();
 	delete _buffers[kBitBack];
 
-	if (_buffers[kBit2])
+	if (_buffers[kBit2]) {
+		_buffers[kBit2]->free();
 		delete _buffers[kBit2];
+	}
 
 	delete _fonts[kFontDialogue];
 	delete _fonts[kFontLabel];