From 6d8695127fa2299b16f3c38ac3c733dcb1f8e66e Mon Sep 17 00:00:00 2001 From: Gregory Hainaut Date: Thu, 14 May 2015 11:56:07 +0200 Subject: [PATCH] gsdx-recorder: use recursive mutex --- plugins/GSdx/GSCapture.cpp | 6 +++--- plugins/GSdx/GSCapture.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/GSdx/GSCapture.cpp b/plugins/GSdx/GSCapture.cpp index d5c7b34615..ec2ff723c2 100644 --- a/plugins/GSdx/GSCapture.cpp +++ b/plugins/GSdx/GSCapture.cpp @@ -387,7 +387,7 @@ GSCapture::~GSCapture() bool GSCapture::BeginCapture(float fps) { #ifdef _CX11_ - std::lock_guard lock(m_lock); + std::lock_guard 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 lock(m_lock); + std::lock_guard 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 lock(m_lock); + std::lock_guard lock(m_lock); #else GSAutoLock lock(&m_lock); #endif diff --git a/plugins/GSdx/GSCapture.h b/plugins/GSdx/GSCapture.h index f6a0d56c0e..bddabc6eb9 100644 --- a/plugins/GSdx/GSCapture.h +++ b/plugins/GSdx/GSCapture.h @@ -33,7 +33,7 @@ class GSCapture { #ifdef _CX11_ - std::mutex m_lock; + std::recursive_mutex m_lock; #else GSCritSec m_lock; #endif