summaryrefslogtreecommitdiff
path: root/src/core/World.cpp
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2020-02-15 14:54:46 +0300
committerNikolay Korolev <nickvnuk@gmail.com>2020-02-15 14:54:46 +0300
commita361fc0ff5359cc4e1845cd6b62ee50b4d81a3d1 (patch)
tree147d551bbb7f0de6d6048566405956f18252bfff /src/core/World.cpp
parent043efaf082a8ce5010e6ff974afea05d8d66e9d1 (diff)
parent04eac2a06cd2e9d7f042a051c3755625b2ea01ae (diff)
sync with upstream
Diffstat (limited to 'src/core/World.cpp')
-rw-r--r--src/core/World.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/core/World.cpp b/src/core/World.cpp
index d026e971..70e526e8 100644
--- a/src/core/World.cpp
+++ b/src/core/World.cpp
@@ -866,10 +866,9 @@ CVehicle*
FindPlayerVehicle(void)
{
CPlayerPed *ped = FindPlayerPed();
- if(ped->InVehicle())
+ if(ped && ped->InVehicle())
return ped->m_pMyVehicle;
- else
- return nil;
+ return nil;
}
CVehicle*