From 8432b9eddc4942adc89b6a7ca3148e6d2f50c2b9 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Thu, 16 Oct 2014 02:00:53 +0200
Subject: [PATCH] Maybe solves #210

---
 code/ryzom/client/src/main_loop.cpp            | 2 ++
 code/ryzom/client/src/motion/user_controls.cpp | 4 ++++
 code/ryzom/client/src/motion/user_controls.h   | 2 ++
 3 files changed, 8 insertions(+)

diff --git a/code/ryzom/client/src/main_loop.cpp b/code/ryzom/client/src/main_loop.cpp
index f6d921ff8..9b39c53c9 100644
--- a/code/ryzom/client/src/main_loop.cpp
+++ b/code/ryzom/client/src/main_loop.cpp
@@ -1013,6 +1013,7 @@ bool mainLoop()
 	SetMouseCursor ();
 	// Set the cursor.
 	ContextCur.context("STAND BY");
+	UserControls.reset();
 
 	// set the default box for keyboard
 	setDefaultChatWindow(PeopleInterraction.ChatGroup.Window);
@@ -2463,6 +2464,7 @@ bool mainLoop()
 				SetMouseCursor ();
 				// Set the cursor.
 				ContextCur.context("STAND BY");
+				UserControls.reset();
 
 				// set the default box for keyboard
 				CChatWindow *defaultChatWindow;
diff --git a/code/ryzom/client/src/motion/user_controls.cpp b/code/ryzom/client/src/motion/user_controls.cpp
index 285848120..897cba9c1 100644
--- a/code/ryzom/client/src/motion/user_controls.cpp
+++ b/code/ryzom/client/src/motion/user_controls.cpp
@@ -174,6 +174,10 @@ void CUserControls::init()
 
 }// init //
 
+void CUserControls::reset()
+{
+	init();
+}
 
 //-----------------------------------------------
 // needReleaseForward :
diff --git a/code/ryzom/client/src/motion/user_controls.h b/code/ryzom/client/src/motion/user_controls.h
index eb4de2020..018b2c8e9 100644
--- a/code/ryzom/client/src/motion/user_controls.h
+++ b/code/ryzom/client/src/motion/user_controls.h
@@ -152,6 +152,8 @@ public:
 	/// Constructor
 	CUserControls();
 
+	void reset();
+
 	/// Return the string associated to the motion Mode.
 	std::string modeStr() const;
 	/// Return the motion Mode.