From 238298f6952dc3aa0309012a4bc9a79aac35831d Mon Sep 17 00:00:00 2001
From: Elad Ashkenazi <elad3356p@gmail.com>
Date: Wed, 21 Sep 2022 21:10:59 +0300
Subject: [PATCH] sys_ppu_thread: Fix surmixer hack (#12689)

* sys_ppu_thread: Fix surmixer hack

* Hotfix after #12678
---
 rpcs3/Emu/Cell/lv2/sys_event.cpp      | 2 +-
 rpcs3/Emu/Cell/lv2/sys_ppu_thread.cpp | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/rpcs3/Emu/Cell/lv2/sys_event.cpp b/rpcs3/Emu/Cell/lv2/sys_event.cpp
index aed56f207d..e5ee920a97 100644
--- a/rpcs3/Emu/Cell/lv2/sys_event.cpp
+++ b/rpcs3/Emu/Cell/lv2/sys_event.cpp
@@ -405,7 +405,7 @@ error_code sys_event_queue_tryreceive(ppu_thread& ppu, u32 equeue_id, vm::ptr<sy
 	lock.unlock();
 	ppu.check_state();
 
-	std::copy_n(event_array.get_ptr(), count, events.begin());
+	std::copy_n(events.begin(), count, event_array.get_ptr());
 	*number = count;
 
 	return CELL_OK;
diff --git a/rpcs3/Emu/Cell/lv2/sys_ppu_thread.cpp b/rpcs3/Emu/Cell/lv2/sys_ppu_thread.cpp
index 9d5d8f44d9..25b0049d33 100644
--- a/rpcs3/Emu/Cell/lv2/sys_ppu_thread.cpp
+++ b/rpcs3/Emu/Cell/lv2/sys_ppu_thread.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "stdafx.h"
 #include "sys_ppu_thread.h"
 
 #include "Emu/System.h"
@@ -536,6 +536,7 @@ error_code sys_ppu_thread_start(ppu_thread& ppu, u32 thread_id)
 		// Dirty hack for sound: confirm the creation of _mxr000 event queue
 		if (*thread->ppu_tname.load() == "_cellsurMixerMain"sv)
 		{
+			ppu.check_state();
 			lv2_obj::sleep(ppu);
 
 			while (!idm::select<lv2_obj, lv2_event_queue>([](u32, lv2_event_queue& eq)