From 6369256022cc9634573bd3161ae469d328eb7e90 Mon Sep 17 00:00:00 2001
From: Benau <Benau@users.noreply.github.com>
Date: Tue, 24 Jul 2018 14:18:43 +0800
Subject: [PATCH] Reset rewinding manager at each online or offline game

---
 src/modes/world.cpp                      | 2 +-
 src/network/protocols/lobby_protocol.cpp | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/modes/world.cpp b/src/modes/world.cpp
index 2d434bf7b..fafccb261 100644
--- a/src/modes/world.cpp
+++ b/src/modes/world.cpp
@@ -120,7 +120,7 @@ World* World::m_world = NULL;
  */
 World::World() : WorldStatus()
 {
-
+    RewindManager::setEnable(NetworkConfig::get()->isNetworking());
 #ifdef DEBUG
     m_magic_number = 0xB01D6543;
 #endif
diff --git a/src/network/protocols/lobby_protocol.cpp b/src/network/protocols/lobby_protocol.cpp
index db6850259..7813238ea 100644
--- a/src/network/protocols/lobby_protocol.cpp
+++ b/src/network/protocols/lobby_protocol.cpp
@@ -28,7 +28,6 @@
 #include "network/protocols/game_protocol.hpp"
 #include "network/protocols/game_events_protocol.hpp"
 #include "network/race_event_manager.hpp"
-#include "network/rewind_manager.hpp"
 #include "race/race_manager.hpp"
 #include "states_screens/state_manager.hpp"
 
@@ -59,8 +58,6 @@ LobbyProtocol::~LobbyProtocol()
 void LobbyProtocol::loadWorld()
 {
     Log::info("LobbyProtocol", "Ready !");
-    RewindManager::setEnable(true);
-
     // Race startup sequence
     // ---------------------
     // This creates the network world.