From 8cb1838c4afc74b7a878355a03ee71bc9c887ec2 Mon Sep 17 00:00:00 2001 From: Alexei Kotov Date: Sun, 9 Mar 2025 00:52:00 +0300 Subject: [PATCH] Don't require a reference for GetSoundPlaying (#8389) --- apps/openmw/mwscript/soundextensions.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/apps/openmw/mwscript/soundextensions.cpp b/apps/openmw/mwscript/soundextensions.cpp index c248c30520..0f9d85cc38 100644 --- a/apps/openmw/mwscript/soundextensions.cpp +++ b/apps/openmw/mwscript/soundextensions.cpp @@ -162,11 +162,17 @@ namespace MWScript public: void execute(Interpreter::Runtime& runtime) override { - MWWorld::Ptr ptr = R()(runtime); + MWWorld::Ptr ptr = R()(runtime, false); int index = runtime[0].mInteger; runtime.pop(); + if (ptr.isEmpty()) + { + runtime.push(0); + return; + } + bool ret = MWBase::Environment::get().getSoundManager()->getSoundPlaying( ptr, ESM::RefId::stringRefId(runtime.getStringLiteral(index)));