1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-06 09:09:40 +02:00
This commit is contained in:
ori.bar
2011-09-17 18:15:10 +00:00
parent 1e4a08529c
commit 74fafbedbf
3 changed files with 24 additions and 10 deletions

View File

@@ -1186,7 +1186,10 @@ bool CPlayerInterface::altPressed() const
void CPlayerInterface::showGarrisonDialog( const CArmedInstance *up, const CGHeroInstance *down, bool removableUnits, boost::function<void()> &onEnd )
{
if(stillMoveHero.get() == DURING_MOVE && adventureInt->terrain.currentPath->nodes.size() > 1) //to ignore calls on passing through garrisons
{
onEnd();
return;
}
{
boost::unique_lock<boost::mutex> un(showingDialog->mx);