[Scummvm-git-logs] scummvm master -> 673d25a9cd65b816b7bec23da85e8acff22dc28e

[csnover]

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:
673d25a9cd SCI32: Fix crash starting KQ7 demo


Commit: 673d25a9cd65b816b7bec23da85e8acff22dc28e
    https://github.com/scummvm/scummvm/commit/673d25a9cd65b816b7bec23da85e8acff22dc28e
Author: Colin Snover (github.com at zetafleet.com)
Date: 2017-11-28T16:47:37-06:00

Commit Message:
SCI32: Fix crash starting KQ7 demo

Fixes Trac#10343.

Changed paths:
    engines/sci/engine/features.cpp


diff --git a/engines/sci/engine/features.cpp b/engines/sci/engine/features.cpp
index 1297ba2..7172a6f 100644
--- a/engines/sci/engine/features.cpp
+++ b/engines/sci/engine/features.cpp
@@ -704,6 +704,10 @@ bool GameFeatures::generalMidiOnly() {
 	case GID_MOTHERGOOSEHIRES:
 		return true;
 	case GID_KQ7: {
+		if (g_sci->isDemo()) {
+			return false;
+		}
+
 		SoundResource sound(13, g_sci->getResMan(), detectDoSoundType());
 		return (sound.getTrackByType(/* AdLib */ 0) == nullptr);
 	}