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

[dreammaster]

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:
aeb05bd965 TITANIC: Fix behaviour of Phonograph Lid


Commit: aeb05bd965a094e48f38a1d401dd7872928d7478
    https://github.com/scummvm/scummvm/commit/aeb05bd965a094e48f38a1d401dd7872928d7478
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-01-11T21:12:58-05:00

Commit Message:
TITANIC: Fix behaviour of Phonograph Lid

Changed paths:
    engines/titanic/game/phonograph_lid.cpp


diff --git a/engines/titanic/game/phonograph_lid.cpp b/engines/titanic/game/phonograph_lid.cpp
index d1ab478..e4e5f48 100644
--- a/engines/titanic/game/phonograph_lid.cpp
+++ b/engines/titanic/game/phonograph_lid.cpp
@@ -47,18 +47,18 @@ bool CPhonographLid::MouseButtonDownMsg(CMouseButtonDownMsg *msg) {
 	CQueryPhonographState stateMsg;
 	stateMsg.execute(getParent(), nullptr, MSGFLAG_SCAN);
 	if (stateMsg._value) {
+		petDisplayMessage(0, LOCKED_MUSIC_SYSTEM);
+	} else {
 		if (_open) {
+			playMovie(27, 55, 0);
+		} else {
 			CGameObject *lock = dynamic_cast<CGameObject *>(findByName("Music System Lock"));
 			if (lock)
 				lock->setVisible(false);
 			playMovie(0, 27, 0);
-		} else {
-			playMovie(27, 55, 0);
 		}
 
 		_open = !_open;
-	} else {
-		petDisplayMessage(0, LOCKED_MUSIC_SYSTEM);
 	}
 
 	return true;