From c5db72860676cbc574b9fb0d1b5699c9376742b2 Mon Sep 17 00:00:00 2001
From: Eidolon <furyhunter600@gmail.com>
Date: Tue, 5 Dec 2023 19:19:01 -0600
Subject: [PATCH] Immediately load 0-length sfx lumps as nullopt

---
 src/audio/chunk_load.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/audio/chunk_load.cpp b/src/audio/chunk_load.cpp
index c076c1bdb..782b70ca3 100644
--- a/src/audio/chunk_load.cpp
+++ b/src/audio/chunk_load.cpp
@@ -214,7 +214,12 @@ optional<SoundChunk> try_load_gme(tcb::span<std::byte> data)
 
 optional<SoundChunk> srb2::audio::try_load_chunk(tcb::span<std::byte> data)
 {
-	optional<SoundChunk> ret;
+	optional<SoundChunk> ret = nullopt;
+
+	if (data.size() == 0)
+	{
+		return ret;
+	}
 
 	ret = try_load_dmx(data);
 	if (ret)
@@ -232,5 +237,5 @@ optional<SoundChunk> srb2::audio::try_load_chunk(tcb::span<std::byte> data)
 	if (ret)
 		return ret;
 
-	return nullopt;
+	return ret;
 }