From d390dff54d046fca32668ba5af741f101d097442 Mon Sep 17 00:00:00 2001
From: FeniksFire <feniks_fire@o2.pl>
Date: Sat, 13 May 2017 09:54:03 +0200
Subject: [PATCH] Fix game crash after autofight.

Vcmi makes crash when I turn on autofight in the battle and wait until I
close result battle window.
---
 client/battle/CBattleInterface.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/battle/CBattleInterface.cpp b/client/battle/CBattleInterface.cpp
index 0db08b124..9b010abef 100644
--- a/client/battle/CBattleInterface.cpp
+++ b/client/battle/CBattleInterface.cpp
@@ -1234,8 +1234,8 @@ void CBattleInterface::battleFinished(const BattleResult& br)
 		auto unlockPim = vstd::makeUnlockGuard(*CPlayerInterface::pim);
 		animsAreDisplayed.waitUntil(false);
 	}
-	displayBattleFinished();
 	setActiveStack(nullptr);
+	displayBattleFinished();
 }
 
 void CBattleInterface::displayBattleFinished()