ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

gsdx-recorder: use recursive mutex
This commit is contained in:
Gregory Hainaut 2015-05-14 19:38:44 +02:00
parent 88a714327a 6d8695127f
commit 7f2bbdceb9
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/GSdx/GSCapture.cpp
View File

@ -387,7 +387,7 @@ GSCapture::~GSCapture()
bool GSCapture::BeginCapture(float fps) bool GSCapture::BeginCapture(float fps)
{ {
#ifdef _CX11_ #ifdef _CX11_
std::lock_guard<std::mutex> lock(m_lock); std::lock_guard<std::recursive_mutex> lock(m_lock);
#else #else
GSAutoLock lock(&m_lock); GSAutoLock lock(&m_lock);
#endif #endif
@ -486,7 +486,7 @@ bool GSCapture::BeginCapture(float fps)
bool GSCapture::DeliverFrame(const void* bits, int pitch, bool rgba) bool GSCapture::DeliverFrame(const void* bits, int pitch, bool rgba)
{ {
#ifdef _CX11_ #ifdef _CX11_
std::lock_guard<std::mutex> lock(m_lock); std::lock_guard<std::recursive_mutex> lock(m_lock);
#else #else
GSAutoLock lock(&m_lock); GSAutoLock lock(&m_lock);
#endif #endif
@ -515,7 +515,7 @@ bool GSCapture::DeliverFrame(const void* bits, int pitch, bool rgba)
bool GSCapture::EndCapture() bool GSCapture::EndCapture()
{ {
#ifdef _CX11_ #ifdef _CX11_
std::lock_guard<std::mutex> lock(m_lock); std::lock_guard<std::recursive_mutex> lock(m_lock);
#else #else
GSAutoLock lock(&m_lock); GSAutoLock lock(&m_lock);
#endif #endif

2
plugins/GSdx/GSCapture.h
View File

@ -33,7 +33,7 @@
class GSCapture class GSCapture
{ {
#ifdef _CX11_ #ifdef _CX11_
std::mutex m_lock; std::recursive_mutex m_lock;
#else #else
GSCritSec m_lock; GSCritSec m_lock;
#endif #endif