Added missing safety check

garethyr · garethyr · commit e9a265a93df6 · 2023-05-24T11:17:27.000-03:00
diff --git a/Entities/AHuman.cpp b/Entities/AHuman.cpp
@@ -3411,8 +3411,10 @@ void AHuman::Update()
 			}
 		}
 	} else if (m_ArmsState == THROWING_RELEASE && m_ThrowTmr.GetElapsedSimTimeMS() > 100) {
-		m_pFGArm->SetHeldDevice(dynamic_cast<HeldDevice *>(SwapNextInventory()));
-		m_pFGArm->SetHandPos(m_Pos + RotateOffset(m_HolsterOffset));
+		if (m_pFGArm) {
+			m_pFGArm->SetHeldDevice(dynamic_cast<HeldDevice *>(SwapNextInventory()));
+			m_pFGArm->SetHandPos(m_Pos + RotateOffset(m_HolsterOffset));
+		}
 		EquipShieldInBGArm();
 		m_ArmsState = WEAPON_READY;
 	} else if (m_ArmsState == THROWING_RELEASE) {

Original file line number	Diff line number	Diff line change
`@@ -3411,8 +3411,10 @@ void AHuman::Update()`
`3411`	`3411`	`}`
`3412`	`3412`	`}`
`3413`	`3413`	`} else if (m_ArmsState == THROWING_RELEASE && m_ThrowTmr.GetElapsedSimTimeMS() > 100) {`
`3414`		`- m_pFGArm->SetHeldDevice(dynamic_cast<HeldDevice *>(SwapNextInventory()));`
`3415`		`- m_pFGArm->SetHandPos(m_Pos + RotateOffset(m_HolsterOffset));`
	`3414`	`+ if (m_pFGArm) {`
	`3415`	`+ m_pFGArm->SetHeldDevice(dynamic_cast<HeldDevice *>(SwapNextInventory()));`
	`3416`	`+ m_pFGArm->SetHandPos(m_Pos + RotateOffset(m_HolsterOffset));`
	`3417`	`+ }`
`3416`	`3418`	`EquipShieldInBGArm();`
`3417`	`3419`	`m_ArmsState = WEAPON_READY;`
`3418`	`3420`	`} else if (m_ArmsState == THROWING_RELEASE) {`