0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix #9561 OOS when undoing in multiplayer (#9566)

Browse source 
previously in `undoable_action->undo(side_) ` the undo stack was not in sync with the relpay stack because the code called `undos_.pop_back();` before that and `resources::recorder->undo_cut` after that, this could confuse the code which sends replay commands to the other clients.
This commit is contained in:
gfgtdf 2024-11-12 02:03:45 +01:00 • committed by GitHub
parent ce54c007bd
commit 690ff375b7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/actions/undo.cpp
View file

@ -335,7 +335,6 @@ void undo_list::undo()
// Get the action to undo. (This will be placed on the redo stack, but
// only if the undo is successful.)
auto action = std::move(undos_.back());
undos_.pop_back();
if (undo_action* undoable_action = dynamic_cast<undo_action*>(action.get()))
{
int last_unit_id = resources::gameboard->unit_id_manager().get_save_id();
@ -348,6 +347,7 @@ void undo_list::undo()
resources::gameboard->unit_id_manager().set_save_id(last_unit_id - undoable_action->unit_id_diff);
// Bookkeeping.
undos_.pop_back();
redos_.emplace_back(new config());
resources::recorder->undo_cut(*redos_.back());
@ -361,6 +361,7 @@ void undo_list::undo()
else
{
//ignore this action, and undo the previous one.
undos_.pop_back();
config replay_data;
resources::recorder->undo_cut(replay_data);
undo();