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

m-kiewitz m_kiewitz at users.sourceforge.net
Sun Jul 5 21:26:02 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:
cae493523c MADE: Music: initialize musicType variable


Commit: cae493523c8f1d3c7ae4e5da28c12a4633baf4be
    https://github.com/scummvm/scummvm/commit/cae493523c8f1d3c7ae4e5da28c12a4633baf4be
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2015-07-05T21:26:08+02:00

Commit Message:
MADE: Music: initialize musicType variable

wasn't initialized in case milesAudio was disabled

Changed paths:
    engines/made/music.cpp



diff --git a/engines/made/music.cpp b/engines/made/music.cpp
index aab22fd..f57da83 100644
--- a/engines/made/music.cpp
+++ b/engines/made/music.cpp
@@ -37,7 +37,7 @@
 namespace Made {
 
 MusicPlayer::MusicPlayer(bool milesAudio) : _isGM(false),_milesAudioMode(false) {
-	MusicType musicType;
+	MusicType musicType = MT_INVALID;
 	if (milesAudio) {
 		MidiDriver::DeviceHandle dev = MidiDriver::detectDevice(MDT_MIDI | MDT_ADLIB | MDT_PREFER_MT32);
 		musicType = MidiDriver::getMusicType(dev);






More information about the Scummvm-git-logs mailing list