@@ -53,6 +53,10 @@ void UnitPanicBState::think()
 	// reset the unit's time units when all panicking is done
 	if (_unit)
 	{
+		if (!_unit->isOut())
+		{
+			_unit->abortTurn(); // set the unit status to standing in case it wasn't otherwise changed from berserk/panicked
+		}
 		_unit->setTimeUnits(0);
 	}
 	_parent->popState();
Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,10 @@ void UnitPanicBState::think()`
`53`	`53`	`// reset the unit's time units when all panicking is done`
`54`	`54`	`if (_unit)`
`55`	`55`	`{`
	`56`	`+ if (!_unit->isOut())`
	`57`	`+ {`
	`58`	`+ _unit->abortTurn(); // set the unit status to standing in case it wasn't otherwise changed from berserk/panicked`
	`59`	`+ }`
`56`	`60`	`_unit->setTimeUnits(0);`
`57`	`61`	`}`
`58`	`62`	`_parent->popState();`