preserve-emulation/pcsx2
1
0 Fork 0
mirror of https://github.com/PCSX2/pcsx2.git synced 2026-11-14 02:00:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #542 from PCSX2/gsdx-issue-539

Browse Source 
gsdx-recorder: use recursive mutex
This commit is contained in:
Gregory Hainaut committed 2015-05-14 19:38:44 +02:00
2 parents 88a714327a 6d8695127f
commit 7f2bbdceb9
2 files changed
+4 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

plugins/GSdx/GSCapture.cpp
+3 -3
View File
@@ -387,7 +387,7 @@ GSCapture::~GSCapture()
bool GSCapture::BeginCapture(float fps)
{
#ifdef _CX11_
std::lock_guard<std::mutex> lock(m_lock);
std::lock_guard<std::recursive_mutex> lock(m_lock);
#else
GSAutoLock lock(&m_lock);
#endif
@@ -486,7 +486,7 @@ bool GSCapture::BeginCapture(float fps)
bool GSCapture::DeliverFrame(const void* bits, int pitch, bool rgba)
{
#ifdef _CX11_
std::lock_guard<std::mutex> lock(m_lock);
std::lock_guard<std::recursive_mutex> lock(m_lock);
#else
GSAutoLock lock(&m_lock);
#endif
@@ -515,7 +515,7 @@ bool GSCapture::DeliverFrame(const void* bits, int pitch, bool rgba)
bool GSCapture::EndCapture()
{
#ifdef _CX11_
std::lock_guard<std::mutex> lock(m_lock);
std::lock_guard<std::recursive_mutex> lock(m_lock);
#else
GSAutoLock lock(&m_lock);
#endif
plugins/GSdx/GSCapture.h
+1 -1
View File
@@ -33,7 +33,7 @@
class GSCapture
{
#ifdef _CX11_
std::mutex m_lock;
std::recursive_mutex m_lock;
#else
GSCritSec m_lock;
#endif