Fixed bug 2879795. Ensure cursor is visible after save/load dialog and debugger are closed.

svn-id: r45138

4 files changed, 6 insertions, 2 deletions

diff --git a/engines/parallaction/debug.cpp b/engines/parallaction/debug.cpp
index ac1e8c37e5..4cdd7f989e 100644
--- a/engines/parallaction/debug.cpp
+++ b/engines/parallaction/debug.cpp
@@ -51,10 +51,13 @@ Debugger::Debugger(Parallaction *vm)
 
 
 void Debugger::preEnter() {
+	_mouseState = _vm->_input->getMouseState();
 }
 
 
 void Debugger::postEnter() {
+	_vm->_input->setMouseState(_mouseState);
+	_vm->_input->setArrowCursor();	// unselects the active item, if any
 }
 
 bool Debugger::Cmd_Location(int argc, const char **argv) {
diff --git a/engines/parallaction/debug.h b/engines/parallaction/debug.h
index 8345e62d8a..54b578e95f 100644
--- a/engines/parallaction/debug.h
+++ b/engines/parallaction/debug.h
@@ -3,6 +3,7 @@
 #define PARALLACTION_DEBUGGER_H
 
 #include "gui/debugger.h"
+#include "parallaction/input.h"
 
 namespace Parallaction {
 
@@ -15,6 +16,7 @@ public:
 
 protected:
 	Parallaction *_vm;
+	MouseTriState _mouseState;
 
 	virtual void preEnter();
 	virtual void postEnter();
diff --git a/engines/parallaction/parallaction_ns.cpp b/engines/parallaction/parallaction_ns.cpp
index de3cb1e557..6e6d51101b 100644
--- a/engines/parallaction/parallaction_ns.cpp
+++ b/engines/parallaction/parallaction_ns.cpp
@@ -267,6 +267,7 @@ bool Parallaction_ns::processGameEvent(int event) {
 	}
 
 	_input->setArrowCursor();
+	_input->setMouseState(MOUSE_ENABLED_SHOW);
 
 	return c;
 }
diff --git a/engines/parallaction/saveload.cpp b/engines/parallaction/saveload.cpp
index 44bacf87a1..bb9ac1503e 100644
--- a/engines/parallaction/saveload.cpp
+++ b/engines/parallaction/saveload.cpp
@@ -255,8 +255,6 @@ bool SaveLoad::loadGame() {
 	GUI::TimedMessageDialog dialog("Loading game...", 1500);
 	dialog.runModal();
 
-	_vm->_input->setArrowCursor();
-
 	return true;
 }