[Scummvm-cvs-logs] scummvm master -> 47d905486cea5c98a5da632ad04c537c2c02be16

eriktorbjorn eriktorbjorn at telia.com
Sun Jun 7 19:37:05 CEST 2015


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:
47d905486c SHERLOCK: Initialize _midiParser. Fixes crash on exit in 3DO version.


Commit: 47d905486cea5c98a5da632ad04c537c2c02be16
    https://github.com/scummvm/scummvm/commit/47d905486cea5c98a5da632ad04c537c2c02be16
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2015-06-07T19:35:24+02:00

Commit Message:
SHERLOCK: Initialize _midiParser. Fixes crash on exit in 3DO version.

Changed paths:
    engines/sherlock/music.cpp



diff --git a/engines/sherlock/music.cpp b/engines/sherlock/music.cpp
index c0a63be..c00be10 100644
--- a/engines/sherlock/music.cpp
+++ b/engines/sherlock/music.cpp
@@ -197,6 +197,7 @@ Music::Music(SherlockEngine *vm, Audio::Mixer *mixer) : _vm(vm), _mixer(mixer) {
 		// 3DO - disable music
 		// TODO: Implement music support
 		_driver = NULL;
+		_midiParser = NULL;
 		_musicType = MT_NULL;
 		_musicOn = false;
 		return;






More information about the Scummvm-git-logs mailing list