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

[Strangerke]

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:
c31afc0ff9 EFH: Avoid splash screen music when loading a game from menu


Commit: c31afc0ff9ac0c14923b4e4808f87a3218ab4fd4
    https://github.com/scummvm/scummvm/commit/c31afc0ff9ac0c14923b4e4808f87a3218ab4fd4
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2023-04-19T08:07:23+01:00

Commit Message:
EFH: Avoid splash screen music when loading a game from menu

Changed paths:
    engines/efh/efh.cpp


diff --git a/engines/efh/efh.cpp b/engines/efh/efh.cpp
index 074b596af47..c15711b70e9 100644
--- a/engines/efh/efh.cpp
+++ b/engines/efh/efh.cpp
@@ -440,11 +440,13 @@ void EfhEngine::initEngine() {
 	fileName = "titlsong";
 	readFileToBuffer(fileName, _titleSong);
 	setDefaultNoteDuration();
-	Common::KeyCode lastInput = playSong(_titleSong);
+	Common::KeyCode lastInput = Common::KEYCODE_INVALID;
 
-	if (lastInput != Common::KEYCODE_ESCAPE && _loadSaveSlot == -1) {
+	if (_loadSaveSlot == -1)
+		lastInput = playSong(_titleSong);
+
+	if (lastInput != Common::KEYCODE_ESCAPE && _loadSaveSlot == -1)
 		playIntro();
-	}
 
 	loadImageSet(6, _circleImageBuf, _circleImageSubFileArray, _decompBuf);
 	readImpFile(99, false);