Skip to content

Commit 96f0699

Browse files
committed
Fix crash in CModelInfoSA::GetVehicleWheelSize if model info is not loaded
Also applied to SetVehicleWheelSize
1 parent f676181 commit 96f0699

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

Client/game_sa/CModelInfoSA.cpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1020,6 +1020,10 @@ float CModelInfoSA::GetVehicleWheelSize(eResizableVehicleWheelGroup eWheelGroup)
10201020
if (!IsVehicle())
10211021
return 0.0f;
10221022

1023+
// Request model load right now if not loaded yet
1024+
if (!IsLoaded())
1025+
Request(BLOCKING, "GetVehicleWheelSize");
1026+
10231027
auto pVehicleModel = reinterpret_cast<CVehicleModelInfoSAInterface*>(m_pInterface);
10241028
switch (eWheelGroup)
10251029
{
@@ -1037,6 +1041,10 @@ void CModelInfoSA::SetVehicleWheelSize(eResizableVehicleWheelGroup eWheelGroup,
10371041
if (!IsVehicle())
10381042
return;
10391043

1044+
// Request model load right now if not loaded yet
1045+
if (!IsLoaded())
1046+
Request(BLOCKING, "SetVehicleWheelSize");
1047+
10401048
auto pVehicleModel = reinterpret_cast<CVehicleModelInfoSAInterface*>(m_pInterface);
10411049

10421050
// Store default wheel sizes in map

0 commit comments

Comments
 (0)