Skip to content

Commit 87644f5

Browse files
committed
Check for nullptr in CPedSA::SetCurrentWeaponSlot
1 parent 93f51f7 commit 87644f5

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

Client/game_sa/CPedSA.cpp

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -464,9 +464,14 @@ void CPedSA::SetCurrentWeaponSlot(eWeaponSlot weaponSlot)
464464
eWeaponSlot currentSlot = GetCurrentWeaponSlot();
465465
if (weaponSlot != GetCurrentWeaponSlot())
466466
{
467-
CWeapon* pWeapon = GetWeapon(currentSlot);
468-
if (pWeapon)
469-
RemoveWeaponModel(pWeapon->GetInfo(WEAPONSKILL_STD)->GetModel());
467+
CWeapon* weapon = GetWeapon(currentSlot);
468+
if (weapon)
469+
{
470+
CWeaponInfo* weaponInfo = weapon->GetInfo(WEAPONSKILL_STD);
471+
472+
if (weaponInfo)
473+
RemoveWeaponModel(weaponInfo->GetModel());
474+
}
470475

471476
CPedSAInterface* thisPed = (CPedSAInterface*)GetInterface();
472477

0 commit comments

Comments
 (0)