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

dreammaster dreammaster at scummvm.org
Mon Sep 26 00:42:34 CEST 2016


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:
de9e2499ae TITANIC: Fix crash using television channel buttons


Commit: de9e2499aee9912186ce020584210c9b0f6b6254
    https://github.com/scummvm/scummvm/commit/de9e2499aee9912186ce020584210c9b0f6b6254
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-09-25T18:42:26-04:00

Commit Message:
TITANIC: Fix crash using television channel buttons

Changed paths:
    engines/titanic/core/game_object.cpp



diff --git a/engines/titanic/core/game_object.cpp b/engines/titanic/core/game_object.cpp
index a1427b1..56c8389 100644
--- a/engines/titanic/core/game_object.cpp
+++ b/engines/titanic/core/game_object.cpp
@@ -749,13 +749,13 @@ int CGameObject::playSound(const CString &name, CProximity &prox) {
 	}
 
 	CGameManager *gameManager = getGameManager();
-	if (gameManager) {
+	if (gameManager && !name.empty()) {
 		g_vm->_filesManager->preload(name);
 
 		gameManager->_sound.playSound(name, prox);
 	}
 
-	return 0;
+	return -1;
 }
 
 int CGameObject::queueSound(const CString &name, uint priorHandle, uint volume, int balance, bool repeated) {





More information about the Scummvm-git-logs mailing list