From 7b303ad94668690a1defb25ea72afc0d5cacb958 Mon Sep 17 00:00:00 2001
From: Thanasis Antoniou
Date: Sat, 23 Feb 2019 16:21:54 +0200
Subject: BLADERUNNER: Dialogue menu bugfix

Fixes loops in conversations with user choices available
---
 engines/bladerunner/dialogue_menu.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/engines/bladerunner/dialogue_menu.cpp b/engines/bladerunner/dialogue_menu.cpp
index 17bd9c2201..61f400cc26 100644
--- a/engines/bladerunner/dialogue_menu.cpp
+++ b/engines/bladerunner/dialogue_menu.cpp
@@ -142,7 +142,7 @@ bool DialogueMenu::addToListNeverRepeatOnceSelected(int answer, int priorityPoli
 		}
 	}
 
-	if (foundIndex > 0 && _neverRepeatWasSelected[foundIndex]) {
+	if (foundIndex >= 0 && _neverRepeatWasSelected[foundIndex]) {
 		return true;
 	}
 
@@ -181,14 +181,14 @@ int DialogueMenu::queryInput() {
 	int answer = -1;
 	if (_listSize == 1) {
 		_selectedItemIndex = 0;
-		answer = _items[0].answerValue;
+		answer = _items[_selectedItemIndex].answerValue;
 	} else if (_listSize == 2) {
 		if (_items[0].isDone) {
 			_selectedItemIndex = 1;
-			answer = _items[0].answerValue;
+			answer = _items[_selectedItemIndex].answerValue;
 		} else if (_items[1].isDone) {
 			_selectedItemIndex = 0;
-			answer = _items[1].answerValue;
+			answer = _items[_selectedItemIndex].answerValue;
 		}
 	}
 
-- 
cgit v1.2.3