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

[eriktorbjorn]

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:
9f34aa69b7 GOB: Fix what looks like an obviously incorrect condition


Commit: 9f34aa69b7d3f8862352984c2681789f431ecf94
    https://github.com/scummvm/scummvm/commit/9f34aa69b7d3f8862352984c2681789f431ecf94
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2017-08-06T12:29:21+02:00

Commit Message:
GOB: Fix what looks like an obviously incorrect condition

Though since I don't have the game I can't actually test it. :-)

Changed paths:
    engines/gob/pregob/onceupon/onceupon.cpp


diff --git a/engines/gob/pregob/onceupon/onceupon.cpp b/engines/gob/pregob/onceupon/onceupon.cpp
index 50910e7..ab9b142 100644
--- a/engines/gob/pregob/onceupon/onceupon.cpp
+++ b/engines/gob/pregob/onceupon/onceupon.cpp
@@ -984,7 +984,7 @@ OnceUpon::MenuAction OnceUpon::doIngameMenu() {
 		// User pressed the return to game button
 		action = kMenuActionPlay;
 
-	} else if (kMenuActionMainMenu) {
+	} else if (action == kMenuActionMainMenu) {
 
 		// User pressed the return to main menu button
 		action = handleMainMenu();