games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-17 00:07:41 +02:00
Code Issues Releases Activity

Fix possible crash on ending battle via on-timer action

Browse Source
This commit is contained in:
Ivan Savenko
2024-01-04 23:57:59 +02:00
parent edb2ecd751
commit c78382c515
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/TurnTimerHandler.cpp
View File

@ -94,8 +94,14 @@ void TurnTimerHandler::update(int waitTime)
if(gs->isPlayerMakingTurn(player)) if(gs->isPlayerMakingTurn(player))
onPlayerMakingTurn(player, waitTime); onPlayerMakingTurn(player, waitTime);
// create copy for iterations - battle might end during onBattleLoop call
std::vector<BattleID> ongoingBattles;
for (auto & battle : gs->currentBattles) for (auto & battle : gs->currentBattles)
onBattleLoop(battle->battleID, waitTime); ongoingBattles.push_back(battle->battleID);
for (auto & battleID : ongoingBattles)
onBattleLoop(battleID, waitTime);
} }
} }