From 2865cecca96ac797791cc5dfa5358ddbe9fad8f1 Mon Sep 17 00:00:00 2001 From: Wojtek Figat Date: Wed, 7 Jul 2021 12:02:29 +0200 Subject: [PATCH] Fix crash if audio gets disposed before content --- Source/Engine/Audio/AudioBackend.h | 2 +- Source/Engine/Audio/AudioClip.cpp | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Source/Engine/Audio/AudioBackend.h b/Source/Engine/Audio/AudioBackend.h index 00b25f471..ddb44cfcc 100644 --- a/Source/Engine/Audio/AudioBackend.h +++ b/Source/Engine/Audio/AudioBackend.h @@ -14,7 +14,7 @@ class AudioBackend friend AudioBackend; friend class AudioService; -private: +public: static AudioBackend* Instance; diff --git a/Source/Engine/Audio/AudioClip.cpp b/Source/Engine/Audio/AudioClip.cpp index 7c1945803..babe12af4 100644 --- a/Source/Engine/Audio/AudioClip.cpp +++ b/Source/Engine/Audio/AudioClip.cpp @@ -413,6 +413,8 @@ Asset::LoadResult AudioClip::load() return LoadResult::MissingDataChunk; // Create single buffer + if (!AudioBackend::Instance) + return LoadResult::Failed; uint32 bufferId; AudioBackend::Buffer::Create(bufferId); Buffers[0] = bufferId;