From 8c68102909f67a3728393a018cdc6a2e50ceb1d5 Mon Sep 17 00:00:00 2001
From: kdmcser <zqtndfj@sina.com>
Date: Wed, 10 Dec 2025 23:02:53 +0800
Subject: [PATCH] fix crash when battle failed

---
 server/battles/BattleResultProcessor.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/server/battles/BattleResultProcessor.cpp b/server/battles/BattleResultProcessor.cpp
index 438b33320..6b4f0a77a 100644
--- a/server/battles/BattleResultProcessor.cpp
+++ b/server/battles/BattleResultProcessor.cpp
@@ -416,8 +416,7 @@ void BattleResultProcessor::battleFinalize(const BattleID & battleID, const Batt
 	{
 		winnerHero = (*battle)->battleGetFightingHero(finishingBattle->winnerSide);
 		loserHero = (*battle)->battleGetFightingHero(CBattleInfoEssentials::otherSide(finishingBattle->winnerSide));
-		auto commander = winnerHero->getCommander();
-		winnerHasUnitsLeft = winnerHero ? winnerHero->stacksCount() > 0 || (commander && commander->alive) : true;
+		winnerHasUnitsLeft = winnerHero ? winnerHero->stacksCount() > 0 || (winnerHero->getCommander() && winnerHero->getCommander()->alive) : true;
 	}
 
 	BattleResultsApplied resultsApplied;