games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-02-09 13:14:02 +02:00
Code Issues Releases Activity

Fix excessive removal of dialogs, e.g. new week or timed events

Browse Source
This commit is contained in:
Ivan Savenko 2024-08-22 16:39:30 +00:00
parent d1aa55de91
commit b6cc409772
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
client/CPlayerInterface.cpp
View File

@ -193,11 +193,6 @@ void CPlayerInterface::closeAllDialogs()
castleInt->close(); castleInt->close();
castleInt = nullptr; castleInt = nullptr;
// remove all pending dialogs that do not expect query answer
vstd::erase_if(dialogs, [](const std::shared_ptr<CInfoWindow> & window){
return window->ID == QueryID::NONE;
});
} }
void CPlayerInterface::playerEndsTurn(PlayerColor player) void CPlayerInterface::playerEndsTurn(PlayerColor player)
@ -207,6 +202,11 @@ void CPlayerInterface::playerEndsTurn(PlayerColor player)
{ {
makingTurn = false; makingTurn = false;
closeAllDialogs(); closeAllDialogs();
// remove all pending dialogs that do not expect query answer
vstd::erase_if(dialogs, [](const std::shared_ptr<CInfoWindow> & window){
return window->ID == QueryID::NONE;
});
} }
} }
@ -1511,7 +1511,7 @@ void CPlayerInterface::update()
return; return;
//if there are any waiting dialogs, show them //if there are any waiting dialogs, show them
if ((CSH->howManyPlayerInterfaces() <= 1 || makingTurn) && !dialogs.empty() && !showingDialog->isBusy()) if (makingTurn && !dialogs.empty() && !showingDialog->isBusy())
{ {
showingDialog->setBusy(); showingDialog->setBusy();
GH.windows().pushWindow(dialogs.front()); GH.windows().pushWindow(dialogs.front());