From 1572524b645b9a40e097a99773cb40e7f954100c Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 7 Jun 2010 09:06:06 +0000
Subject: Moved destruction of globals and resource manager to common M4 engine
 base class - this fixes a bug where resources were still being tossed after
 the resource manager was destroyed

svn-id: r49476
---
 engines/m4/m4.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/engines/m4/m4.cpp b/engines/m4/m4.cpp
index da271b10c9..a5db6660d8 100644
--- a/engines/m4/m4.cpp
+++ b/engines/m4/m4.cpp
@@ -146,6 +146,8 @@ MadsM4Engine::~MadsM4Engine() {
 	delete _ws;
 	delete _random;
 	delete _palette;
+	delete _globals;
+	delete _resourceManager;
 }
 
 Common::Error MadsM4Engine::run() {
@@ -303,8 +305,6 @@ M4Engine::M4Engine(OSystem *syst, const M4GameDescription *gameDesc): MadsM4Engi
 }
 
 M4Engine::~M4Engine() {
-	delete _resourceManager;
-	delete _globals;
 	delete _converse;
 }
 
@@ -500,8 +500,6 @@ MadsEngine::MadsEngine(OSystem *syst, const M4GameDescription *gameDesc): MadsM4
 }
 
 MadsEngine::~MadsEngine() {
-	delete _globals;
-	delete _resourceManager;
 }
 
 Common::Error MadsEngine::run() {
-- 
cgit v1.2.3