[Scummvm-git-logs] scummvm master -> 9da9d4a328c05089fec864a35233b56ba757d532

[neuromancer]

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:
9da9d4a328 HYPNO: avoid crashing during vent level in spider


Commit: 9da9d4a328c05089fec864a35233b56ba757d532
    https://github.com/scummvm/scummvm/commit/9da9d4a328c05089fec864a35233b56ba757d532
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-02-21T18:55:43+01:00

Commit Message:
HYPNO: avoid crashing during vent level in spider

Changed paths:
    engines/hypno/arcade.cpp


diff --git a/engines/hypno/arcade.cpp b/engines/hypno/arcade.cpp
index 53304b4513c..493a5d0fd7d 100644
--- a/engines/hypno/arcade.cpp
+++ b/engines/hypno/arcade.cpp
@@ -324,10 +324,12 @@ void HypnoEngine::runArcade(ArcadeShooting *arc) {
 		if (segments[segmentIdx].end || checkArcadeLevelCompleted(background, segments[segmentIdx])) {
 			skipVideo(background);
 			// Objectives
-			if (arc->obj1KillsRequired > 0 || arc->obj1MissesAllowed > 0) {
+			if ((arc->obj1KillsRequired > 0 || arc->obj1MissesAllowed) > 0 && !_skipLevel) {
 				if (_obj1KillsCount < arc->obj1KillsRequired || _obj1MissesCount > arc->obj1MissesAllowed) {
-					MVideo video(arc->defeatMissBossVideo, Common::Point(0, 0), false, true, false);
-					runIntro(video);
+					if (!arc->defeatMissBossVideo.empty()) {
+						MVideo video(arc->defeatMissBossVideo, Common::Point(0, 0), false, true, false);
+						runIntro(video);
+					}
 					assert(!arc->levelIfLose.empty());
 					_nextLevel = arc->levelIfLose;
 					_lives = _lives - 1;