From 681bab558bdd597715e609047e9aee9f350bb955 Mon Sep 17 00:00:00 2001
From: Vestral <16190165+Vestrel@users.noreply.github.com>
Date: Mon, 10 Jan 2022 21:26:33 +0900
Subject: [PATCH] XAudio: fix deinitialization order

---
 rpcs3/Emu/Audio/XAudio2/XAudio2Backend.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/rpcs3/Emu/Audio/XAudio2/XAudio2Backend.cpp b/rpcs3/Emu/Audio/XAudio2/XAudio2Backend.cpp
index 4e0f3e54a4..3ecfe43362 100644
--- a/rpcs3/Emu/Audio/XAudio2/XAudio2Backend.cpp
+++ b/rpcs3/Emu/Audio/XAudio2/XAudio2Backend.cpp
@@ -103,12 +103,6 @@ void XAudio2Backend::Play()
 
 void XAudio2Backend::CloseUnlocked()
 {
-	if (m_master_voice != nullptr)
-	{
-		m_master_voice->DestroyVoice();
-		m_master_voice = nullptr;
-	}
-
 	if (m_source_voice != nullptr)
 	{
 		const HRESULT hr = m_source_voice->Stop();
@@ -121,6 +115,12 @@ void XAudio2Backend::CloseUnlocked()
 		m_source_voice = nullptr;
 	}
 
+	if (m_master_voice != nullptr)
+	{
+		m_master_voice->DestroyVoice();
+		m_master_voice = nullptr;
+	}
+
 	m_playing = false;
 	m_data_buf = nullptr;
 	m_data_buf_len = 0;