aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilippos Karapetis2014-12-27 01:02:51 +0200
committerFilippos Karapetis2014-12-27 01:02:51 +0200
commitfd34456bb8bcbf39667df50eb6d14a9f4fbe7087 (patch)
treeb1d5ff6cf8448f4e820f31a9a4d32bb5c3b3e50c
parenteb46e837969f2f650b5debaa387e63127b83db6c (diff)
downloadscummvm-rg350-fd34456bb8bcbf39667df50eb6d14a9f4fbe7087.tar.gz
scummvm-rg350-fd34456bb8bcbf39667df50eb6d14a9f4fbe7087.tar.bz2
scummvm-rg350-fd34456bb8bcbf39667df50eb6d14a9f4fbe7087.zip
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
-rw-r--r--engines/zvision/zvision.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index fe8e129800..7c26eba030 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;