[Scummvm-git-logs] scummvm master -> 150f70f94c3d8cf762ca564ac6c05fa52c62f9a8

[dreammaster]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
5bd0d25c42 XEEN: Fix crash exiting game whilst town actions are active
150f70f94c XEEN: Fix hotkeys when Caps Lock is turned on


Commit: 5bd0d25c42244bec026fbe141dd74cae02f01400
    https://github.com/scummvm/scummvm/commit/5bd0d25c42244bec026fbe141dd74cae02f01400
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-11-24T16:56:29-05:00

Commit Message:
XEEN: Fix crash exiting game whilst town actions are active

Changed paths:
    engines/xeen/town.cpp


diff --git a/engines/xeen/town.cpp b/engines/xeen/town.cpp
index 02e0990..0e2f2e7 100644
--- a/engines/xeen/town.cpp
+++ b/engines/xeen/town.cpp
@@ -244,10 +244,13 @@ int Town::townAction(TownAction actionId) {
 	do {
 		townWait();
 		charP = doTownOptions(charP);
+		if (_vm->shouldQuit())
+			return 0;
+
 		title = createTownText(*charP);
 		screen._windows[10].writeString(title);
 		drawButtons(&screen);
-	} while (!_vm->shouldQuit() && _buttonValue != Common::KEYCODE_ESCAPE);
+	} while (_buttonValue != Common::KEYCODE_ESCAPE);
 
 	switch (actionId) {
 	case BLACKSMITH:


Commit: 150f70f94c3d8cf762ca564ac6c05fa52c62f9a8
    https://github.com/scummvm/scummvm/commit/150f70f94c3d8cf762ca564ac6c05fa52c62f9a8
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-11-24T17:01:58-05:00

Commit Message:
XEEN: Fix hotkeys when Caps Lock is turned on

Changed paths:
    engines/xeen/dialogs.cpp


diff --git a/engines/xeen/dialogs.cpp b/engines/xeen/dialogs.cpp
index a88efd2..b890aa7 100644
--- a/engines/xeen/dialogs.cpp
+++ b/engines/xeen/dialogs.cpp
@@ -94,7 +94,7 @@ bool ButtonContainer::checkEvents(XeenEngine *vm) {
 		else if (_buttonValue == Common::KEYCODE_KP_ENTER)
 			_buttonValue = Common::KEYCODE_RETURN;
 
-		_buttonValue |= keyState.flags << 16;
+		_buttonValue |= (keyState.flags & ~Common::KBD_CAPS) << 16;
 		if (_buttonValue)
 			return true;
 	}