Merge branch 'master' into stable

1 files changed, 7 insertions, 4 deletions

diff --git a/src/game.cpp b/src/game.cpp
index 9b6b5a339..80d27a4a1 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -105,6 +105,7 @@
 #include "utils/physfstools.h"
 #include "utils/process.h"
 #include "utils/sdlcheckutils.h"
+#include "utils/timer.h"
 
 #include <sstream>
 #include <string>
@@ -314,9 +315,6 @@ static void createGuiWindows()
         gmChatTab = new GmTab(chatWindow);
     }
 
-    if (config.getBoolValue("logToChat"))
-        logger->setChatWindow(chatWindow);
-
     if (!isSafeMode && chatWindow)
         chatWindow->loadState();
 
@@ -338,7 +336,6 @@ static void destroyGuiWindows()
 {
     Net::getGeneralHandler()->gameEnded();
 
-    logger->setChatWindow(nullptr);
     if (whoIsOnline)
         whoIsOnline->setAllowUpdate(false);
 
@@ -854,6 +851,12 @@ void Game::handleMove()
             setValidSpeed();
             player_node->cancelFollow();
         }
+        else if (inputManager.isActionActive(Input::KEY_MOVE_FORWARD))
+        {
+            direction = player_node->getDirection();
+            setValidSpeed();
+            player_node->cancelFollow();
+        }
 
         if (!inputManager.isActionActive(Input::KEY_EMOTE) || direction == 0)
             moveInDirection(direction);