From 41990883bf003ff075821bc484b605b1ba87c8ad Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Sun, 20 Jun 2010 09:51:11 +0000
Subject: Don't go into "menu input mode" unless the game currently allows the
 menus to be displayed. I hope this is the correct fix to keep Police Quest 1
 from hanging if you press Escape while reading the newspaper in the briefing
 room.

svn-id: r50072
---
 engines/agi/cycle.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'engines')

diff --git a/engines/agi/cycle.cpp b/engines/agi/cycle.cpp
index ee55c783f1..c185c3efb3 100644
--- a/engines/agi/cycle.cpp
+++ b/engines/agi/cycle.cpp
@@ -178,6 +178,9 @@ void AgiEngine::updateTimer() {
 }
 
 void AgiEngine::newInputMode(InputMode mode) {
+	if (mode == INPUT_MENU && !getflag(fMenusWork) && !(getFeatures() & GF_MENUS))
+		return;
+
 	_oldMode = _game.inputMode;
 	_game.inputMode = mode;
 }
-- 
cgit v1.2.3