[Scummvm-git-logs] scummvm master -> c80da50f911a666dfdc861397f751d797dc0b9a6

elasota noreply at scummvm.org
Tue Aug 2 03:27:11 UTC 2022


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:
c80da50f91 MTROPOLIS: Fix crash if MIDI driver fails to load.


Commit: c80da50f911a666dfdc861397f751d797dc0b9a6
    https://github.com/scummvm/scummvm/commit/c80da50f911a666dfdc861397f751d797dc0b9a6
Author: elasota (ejlasota at gmail.com)
Date: 2022-08-01T23:26:56-04:00

Commit Message:
MTROPOLIS: Fix crash if MIDI driver fails to load.

Changed paths:
    engines/mtropolis/plugin/standard.cpp


diff --git a/engines/mtropolis/plugin/standard.cpp b/engines/mtropolis/plugin/standard.cpp
index 8629179616f..d1faaf88a9b 100644
--- a/engines/mtropolis/plugin/standard.cpp
+++ b/engines/mtropolis/plugin/standard.cpp
@@ -1554,11 +1554,14 @@ void MultiMidiPlayer::stopNote(MidiNotePlayer *player) {
 }
 
 uint32 MultiMidiPlayer::getBaseTempo() const {
-	return _driver->getBaseTempo();
+	if (_driver)
+		return _driver->getBaseTempo();
+	return 1;
 }
 
 void MultiMidiPlayer::send(uint32 b) {
-	_driver->send(b);
+	if (_driver)
+		_driver->send(b);
 }
 
 CursorModifier::CursorModifier() : _applyWhen(Event::create()), _removeWhen(Event::create()), _cursorID(0) {




More information about the Scummvm-git-logs mailing list