[Scummvm-cvs-logs] scummvm master -> fd34456bb8bcbf39667df50eb6d14a9f4fbe7087

[bluegr]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
fd34456bb8 ZVISION: Delete the render manager after the script manager on quit


Commit: fd34456bb8bcbf39667df50eb6d14a9f4fbe7087
    https://github.com/scummvm/scummvm/commit/fd34456bb8bcbf39667df50eb6d14a9f4fbe7087
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2014-12-27T01:02:51+02:00

Commit Message:
ZVISION: Delete the render manager after the script manager on quit

This is necessary, as the script manager may include references to the
render manager, such as side effects in Zork: Nemesis. Fixes a crash on
engine exit when the current scene contains such effects

Changed paths:
    engines/zvision/zvision.cpp



diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index fe8e129..7c26eba 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -127,8 +127,8 @@ ZVision::~ZVision() {
 	delete _cursorManager;
 	delete _stringManager;
 	delete _saveManager;
-	delete _renderManager;
 	delete _scriptManager;
+	delete _renderManager;	// should be deleted after the script manager
 	delete _rnd;
 	delete _midiManager;