Fix battlescape only initializing if a unit was selected

OpenXcom · Jul 12, 2017 · 559e755 · 559e755
1 parent 49985a6
commit 559e755
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/Battlescape/BattlescapeState.cpp b/src/Battlescape/BattlescapeState.cpp
@@ -519,10 +519,13 @@ void BattlescapeState::init()
 		_reserve = _btnReserveNone;
 		break;
 	}
-	if (_firstInit && playableUnitSelected())
+	if (_firstInit)
 	{
-		_battleGame->setupCursor();
-		_map->getCamera()->centerOnPosition(_save->getSelectedUnit()->getPosition());
+		if (playableUnitSelected())
+		{
+			_battleGame->setupCursor();
+			_map->getCamera()->centerOnPosition(_save->getSelectedUnit()->getPosition());
+		}
 		_firstInit = false;
 		_btnReserveNone->setGroup(&_reserve);
 		_btnReserveSnap->setGroup(&_reserve);