[Scummvm-git-logs] scummvm master -> 66b8da5b02468680293cef860403d4eb4941a6d9

[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:
66b8da5b02 XEEN: Fix escaping Cast Spell dialog during combat trying to cast spell


Commit: 66b8da5b02468680293cef860403d4eb4941a6d9
    https://github.com/scummvm/scummvm/commit/66b8da5b02468680293cef860403d4eb4941a6d9
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-03-30T20:38:45-04:00

Commit Message:
XEEN: Fix escaping Cast Spell dialog during combat trying to cast spell

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


diff --git a/engines/xeen/dialogs/dialogs_spells.cpp b/engines/xeen/dialogs/dialogs_spells.cpp
index 3645b2e..e1a0c22 100644
--- a/engines/xeen/dialogs/dialogs_spells.cpp
+++ b/engines/xeen/dialogs/dialogs_spells.cpp
@@ -412,7 +412,8 @@ int CastSpell::show(XeenEngine *vm) {
 		spellId = dlg->execute(c);
 
 		if (g_vm->shouldExit() || spellId == -1) {
-			result = 0;
+			result = -1;
+			break;
 		} else {
 			result = spells.castSpell(c, (MagicSpell)spellId);
 		}