Handle lack of an audio device gracefully without hangs

wheremyfoodat · Dec 4, 2024 · 873fca0 · 873fca0
1 parent 63cbfbb
commit 873fca0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/include/audio/miniaudio_device.hpp b/include/audio/miniaudio_device.hpp
@@ -36,4 +36,6 @@ class MiniAudioDevice {
 
 	void start();
 	void stop();
+
+	bool isInitialized() const { return initialized; }
 };
diff --git a/src/emulator.cpp b/src/emulator.cpp
@@ -428,6 +428,10 @@ RomFS::DumpingResult Emulator::dumpRomFS(const std::filesystem::path& path) {
 }
 
 void Emulator::setAudioEnabled(bool enable) {
+	// Don't enable audio if we didn't manage to find an audio device and initialize it properly, otherwise audio sync will break,
+	// because the emulator will expect the audio device to drain the sample buffer, but there's no audio device running...
+	enable = enable && audioDevice.isInitialized();
+
 	if (!enable) {
 		audioDevice.stop();
 	} else if (enable && romType != ROMType::None && running) {