From 8b5847d4a27a928fb7f92e86950e702d31746a21 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Fri, 4 Jun 2021 07:57:05 +0200 Subject: [PATCH] - corrected the NUL checks in S_FindSkinnedSound. --- src/sound/s_advsound.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/sound/s_advsound.cpp b/src/sound/s_advsound.cpp index b29b8f1212..3b7cca0f8b 100644 --- a/src/sound/s_advsound.cpp +++ b/src/sound/s_advsound.cpp @@ -1636,10 +1636,10 @@ int S_FindSkinnedSound (AActor *actor, FSoundID refid) const char *pclass; int gender = 0; - if (actor != nullptr) + if (actor != nullptr && actor->player != nullptr) { - if (actor->player != nullptr) pclass = S_GetSoundClass(actor); - if (actor->player != nullptr) gender = actor->player->userinfo.GetGender(); + pclass = S_GetSoundClass(actor); + gender = actor->player->userinfo.GetGender(); } else {