archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-06 06:51:26 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixes issues where the mutex is destroyed while an unlock is happening

Browse source
This commit is contained in:
RipleyTom 2018-12-30 15:39:40 +01:00 • committed by Ivan
parent 483ee5e488
commit 7ebd3bbcbf
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
rpcs3/Emu/Cell/lv2/sys_mutex.cpp
View file

@ -1,4 +1,4 @@
#include "stdafx.h" #include "stdafx.h"
#include "Emu/Memory/vm.h" #include "Emu/Memory/vm.h"
#include "Emu/System.h" #include "Emu/System.h"
#include "Emu/IdManager.h" #include "Emu/IdManager.h"
@ -80,6 +80,8 @@ error_code sys_mutex_destroy(u32 mutex_id)
const auto mutex = idm::withdraw<lv2_obj, lv2_mutex>(mutex_id, [](lv2_mutex& mutex) -> CellError const auto mutex = idm::withdraw<lv2_obj, lv2_mutex>(mutex_id, [](lv2_mutex& mutex) -> CellError
{ {
std::lock_guard lock(mutex.mutex);
if (mutex.owner || mutex.lock_count) if (mutex.owner || mutex.lock_count)
{ {
return CELL_EBUSY; return CELL_EBUSY;