[Scummvm-git-logs] scummvm master -> 5f4c1e86c9562edf8dd79c172311397953a4dda0

[athrxx]

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:
5f4c1e86c9 SCUMM: fix regression from 0876537f


Commit: 5f4c1e86c9562edf8dd79c172311397953a4dda0
    https://github.com/scummvm/scummvm/commit/5f4c1e86c9562edf8dd79c172311397953a4dda0
Author: athrxx (athrxx at scummvm.org)
Date: 2021-08-10T21:03:33+02:00

Commit Message:
SCUMM: fix regression from 0876537f

(there could still be use after delete cases)

Changed paths:
    engines/scumm/imuse/imuse_player.cpp


diff --git a/engines/scumm/imuse/imuse_player.cpp b/engines/scumm/imuse/imuse_player.cpp
index 454fd8c3a2..64462ac235 100644
--- a/engines/scumm/imuse/imuse_player.cpp
+++ b/engines/scumm/imuse/imuse_player.cpp
@@ -1021,8 +1021,7 @@ void Player::fixAfterLoad() {
 	_midi = _se->getBestMidiDriver(_id);
 	if (!_midi) {
 		clear();
-	} else {
-		_parserType = kParserTypeNone;
+	} else {		
 		start_seq_sound(_id, false);
 		setSpeed(_speed);
 		if (_parser)
@@ -1058,6 +1057,7 @@ void Player::saveLoadWithSerializer(Common::Serializer &s) {
 	if (!s.isSaving() && _parser) {
 		delete _parser;
 		_parser = 0;
+		_parserType = kParserTypeNone;
 	}
 	_music_tick = _parser ? _parser->getTick() : 0;