Merge pull request #4860 from lioncash/lock

FifoPlayerDlg: Use std::lock_guard instead of manual mutex locking/unlocking

1 files changed, 8 insertions, 14 deletions

diff --git a/Source/Core/DolphinWX/FifoPlayerDlg.cpp b/Source/Core/DolphinWX/FifoPlayerDlg.cpp
index bf34f76775..83fa6fd8ae 100644
--- a/Source/Core/DolphinWX/FifoPlayerDlg.cpp
+++ b/Source/Core/DolphinWX/FifoPlayerDlg.cpp
@@ -47,9 +47,10 @@ FifoPlayerDlg::FifoPlayerDlg(wxWindow* const parent)
 {
   CreateGUIControls();
 
-  sMutex.lock();
-  m_EvtHandler = GetEventHandler();
-  sMutex.unlock();
+  {
+    std::lock_guard<std::recursive_mutex> lock{sMutex};
+    m_EvtHandler = GetEventHandler();
+  }
 
   FifoPlayer::GetInstance().SetFileLoadedCallback(FileLoaded);
   FifoPlayer::GetInstance().SetFrameWrittenCallback(FrameWritten);
@@ -59,9 +60,8 @@ FifoPlayerDlg::~FifoPlayerDlg()
 {
   FifoPlayer::GetInstance().SetFrameWrittenCallback(nullptr);
 
-  sMutex.lock();
+  std::lock_guard<std::recursive_mutex> lock{sMutex};
   m_EvtHandler = nullptr;
-  sMutex.unlock();
 }
 
 void FifoPlayerDlg::CreateGUIControls()
@@ -953,39 +953,33 @@ bool FifoPlayerDlg::GetSaveButtonEnabled() const
 
 void FifoPlayerDlg::RecordingFinished()
 {
-  sMutex.lock();
+  std::lock_guard<std::recursive_mutex> lock{sMutex};
 
   if (m_EvtHandler)
   {
     wxCommandEvent event(RECORDING_FINISHED_EVENT);
     m_EvtHandler->AddPendingEvent(event);
   }
-
-  sMutex.unlock();
 }
 
 void FifoPlayerDlg::FileLoaded()
 {
-  sMutex.lock();
+  std::lock_guard<std::recursive_mutex> lock{sMutex};
 
   if (m_EvtHandler)
   {
     wxPaintEvent event;
     m_EvtHandler->AddPendingEvent(event);
   }
-
-  sMutex.unlock();
 }
 
 void FifoPlayerDlg::FrameWritten()
 {
-  sMutex.lock();
+  std::lock_guard<std::recursive_mutex> lock{sMutex};
 
   if (m_EvtHandler)
   {
     wxCommandEvent event(FRAME_WRITTEN_EVENT);
     m_EvtHandler->AddPendingEvent(event);
   }
-
-  sMutex.unlock();
 }