From e84a7725d41ca50771eebb534847305ca2b1c532 Mon Sep 17 00:00:00 2001 From: Jyrki Vesterinen Date: Sun, 18 Feb 2018 13:08:49 +0200 Subject: [PATCH] Networked MP replay: move to end before returning to play mode (#2508) This appears to fix an assertion failure I got while trying to reproduce #2508. Note that #2508 is a different bug (an unhandled exception rather than an assertion failure) and this commit doesn't fix it. --- src/hotkey/hotkey_handler_sp.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/hotkey/hotkey_handler_sp.cpp b/src/hotkey/hotkey_handler_sp.cpp index 5d68de8cf87a..004e8ab6f2a9 100644 --- a/src/hotkey/hotkey_handler_sp.cpp +++ b/src/hotkey/hotkey_handler_sp.cpp @@ -325,6 +325,8 @@ void playsingle_controller::hotkey_handler::replay_exit() { if(!playsingle_controller_.is_networked_mp()) { resources::recorder->delete_upcoming_commands(); + } else { + resources::recorder->set_to_end(); } playsingle_controller_.set_player_type_changed(); }