[Scummvm-git-logs] scummvm master -> 31187e6595b8298f6735b88e73cf0c7f4bdf614b

[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:
31187e6595 XEEN: Fix Not Enough Gold error dialog wasn't showing


Commit: 31187e6595b8298f6735b88e73cf0c7f4bdf614b
    https://github.com/scummvm/scummvm/commit/31187e6595b8298f6735b88e73cf0c7f4bdf614b
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2019-08-09T20:00:57-07:00

Commit Message:
XEEN: Fix Not Enough Gold error dialog wasn't showing

Changed paths:
    engines/xeen/dialogs/dialogs_message.cpp


diff --git a/engines/xeen/dialogs/dialogs_message.cpp b/engines/xeen/dialogs/dialogs_message.cpp
index f571e6e..46038b5 100644
--- a/engines/xeen/dialogs/dialogs_message.cpp
+++ b/engines/xeen/dialogs/dialogs_message.cpp
@@ -51,7 +51,7 @@ void MessageDialog::execute(const Common::String &msg, MessageWaitType waitType)
 		break;
 
 	case WT_ANIMATED_WAIT:
-		if (windows[11]._enabled || _vm->_mode == MODE_INTERACTIVE7) {
+		if (g_vm->_locations->isActive() && (windows[11]._enabled || _vm->_mode == MODE_INTERACTIVE7)) {
 			g_vm->_locations->wait();
 			break;
 		}