[Scummvm-git-logs] scummvm master -> 8201d58577225666ba77cf7b29cab902e7841c11

[ccawley2011]

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:
8201d58577 BACKENDS: Ensure that _timerManager is deleted before _mutexManager


Commit: 8201d58577225666ba77cf7b29cab902e7841c11
    https://github.com/scummvm/scummvm/commit/8201d58577225666ba77cf7b29cab902e7841c11
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2020-05-25T20:21:05+01:00

Commit Message:
BACKENDS: Ensure that _timerManager is deleted before _mutexManager

Changed paths:
    backends/modular-backend.cpp


diff --git a/backends/modular-backend.cpp b/backends/modular-backend.cpp
index 1117518ee0..5073ceae7e 100644
--- a/backends/modular-backend.cpp
+++ b/backends/modular-backend.cpp
@@ -27,6 +27,7 @@
 #include "gui/EventRecorder.h"
 
 #include "audio/mixer.h"
+#include "common/timer.h"
 #include "graphics/pixelformat.h"
 
 ModularBackend::ModularBackend()
@@ -42,6 +43,9 @@ ModularBackend::~ModularBackend() {
 	_graphicsManager = 0;
 	delete _mixer;
 	_mixer = 0;
+	// _timerManager needs to be deleted before _mutexManager to avoid a crash.
+	delete _timerManager;
+	_timerManager = 0;
 	delete _mutexManager;
 	_mutexManager = 0;
 }