Check for nullptr/dead lassat in countUpdate()

Warzone2100 · Feb 19, 2024 · 9abf9ab · 9abf9ab
1 parent a03c532
commit 9abf9ab
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/src/loop.cpp b/src/loop.cpp
@@ -460,7 +460,11 @@ void countUpdate(bool synch)
 		setLasSatExists(false, i);
 		for (const STRUCTURE *psCBuilding : apsStructLists[i])
 		{
-			if (psCBuilding->pStructureType->type == REF_SAT_UPLINK && psCBuilding->status == SS_BUILT)
+			if (psCBuilding == nullptr || isDead(psCBuilding))
+			{
+				continue;
+			}
+			if (psCBuilding->pStructureType && psCBuilding->pStructureType->type == REF_SAT_UPLINK && psCBuilding->status == SS_BUILT)
 			{
 				setSatUplinkExists(true, i);
 			}
@@ -472,7 +476,11 @@ void countUpdate(bool synch)
 		}
 		for (const STRUCTURE *psCBuilding : mission.apsStructLists[i])
 		{
-			if (psCBuilding->pStructureType->type == REF_SAT_UPLINK && psCBuilding->status == SS_BUILT)
+			if (psCBuilding == nullptr || isDead(psCBuilding))
+			{
+				continue;
+			}
+			if (psCBuilding->pStructureType && psCBuilding->pStructureType->type == REF_SAT_UPLINK && psCBuilding->status == SS_BUILT)
 			{
 				setSatUplinkExists(true, i);
 			}