mirror of
https://github.com/vcmi/vcmi.git
synced 2025-03-31 22:05:10 +02:00
Do not auto-remove dialogs such as new week
This commit is contained in:
parent
d36f90e6b6
commit
e8c3252214
@ -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)
|
||||||
@ -1515,7 +1510,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());
|
||||||
|
Loading…
x
Reference in New Issue
Block a user