From de9e2499aee9912186ce020584210c9b0f6b6254 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 25 Sep 2016 18:42:26 -0400
Subject: TITANIC: Fix crash using television channel buttons

---
 engines/titanic/core/game_object.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/titanic/core/game_object.cpp b/engines/titanic/core/game_object.cpp
index a1427b131e..56c838995e 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) {
-- 
cgit v1.2.3