From 87027fbfd96507599ce3a7da45716a4c11b109f9 Mon Sep 17 00:00:00 2001 From: Andreas Maerten <24669514+Yimura@users.noreply.github.com> Date: Wed, 26 Apr 2023 20:17:03 +0200 Subject: [PATCH] fix(OrbitalDrone): crash when selecting a player ped (#1295) --- src/services/orbital_drone/orbital_drone.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/services/orbital_drone/orbital_drone.cpp b/src/services/orbital_drone/orbital_drone.cpp index 152f6815..3ac9b7a1 100644 --- a/src/services/orbital_drone/orbital_drone.cpp +++ b/src/services/orbital_drone/orbital_drone.cpp @@ -358,11 +358,14 @@ namespace big if (PED::IS_PED_A_PLAYER(ent)) { - for (auto ped : g_player_service->players() | std::ranges::views::values) + for (auto player : g_player_service->players() | std::ranges::views::values) { - if (ped && g_pointers->m_gta.m_ptr_to_handle(ped->get_ped()) == ent) + if (player) { - g_player_service->set_selected(ped); + if (const auto ped_ptr = player->get_ped(); ped_ptr && g_pointers->m_gta.m_ptr_to_handle(ped_ptr) == ent) + { + g_player_service->set_selected(player); + } } } }