From 34826c9506c1e7957bae39ebbef13ff567a9c07f Mon Sep 17 00:00:00 2001 From: Gregory Hainaut Date: Mon, 22 Feb 2016 20:17:43 +0100 Subject: [PATCH] PluginManager: port to std::atomic --- pcsx2/PluginManager.cpp | 4 ++-- pcsx2/Plugins.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pcsx2/PluginManager.cpp b/pcsx2/PluginManager.cpp index 8e0f3d3229..1a29b8db19 100644 --- a/pcsx2/PluginManager.cpp +++ b/pcsx2/PluginManager.cpp @@ -1213,7 +1213,7 @@ void SysCorePlugins::Open() if (GSopen2) GetMTGS().WaitForOpen(); - if( !AtomicExchange( m_mcdOpen, true ) ) + if( !m_mcdOpen.exchange(true) ) { DbgCon.Indent().WriteLn( "Opening Memorycards"); OpenPlugin_Mcd(); @@ -1313,7 +1313,7 @@ void SysCorePlugins::Close() Console.WriteLn( Color_StrongBlue, "Closing plugins..." ); - if( AtomicExchange( m_mcdOpen, false ) ) + if( m_mcdOpen.exchange(false) ) { DbgCon.Indent().WriteLn( "Closing Memorycards"); ClosePlugin_Mcd(); diff --git a/pcsx2/Plugins.h b/pcsx2/Plugins.h index 4e4a15e82c..1bfe4f6629 100644 --- a/pcsx2/Plugins.h +++ b/pcsx2/Plugins.h @@ -295,7 +295,7 @@ protected: Threading::MutexRecursive m_mtx_PluginStatus; // Lovely hack until the new PS2E API is completed. - volatile u32 m_mcdOpen; + std::atomic m_mcdOpen; public: // hack until we unsuck plugins... std::unique_ptr m_info[PluginId_AllocCount];