From 7c51e2e34b01c966699a1dfe7017bf8c42827e2c Mon Sep 17 00:00:00 2001
From: Anthony <a.miles.nz@gmail.com>
Date: Thu, 25 Feb 2021 21:38:24 +1300
Subject: [PATCH] Use lock_guard instead of explicit lock/unlock

---
 src/core/kernel/support/EmuFile.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/core/kernel/support/EmuFile.cpp b/src/core/kernel/support/EmuFile.cpp
index 83b3d6f8b..0931a9961 100644
--- a/src/core/kernel/support/EmuFile.cpp
+++ b/src/core/kernel/support/EmuFile.cpp
@@ -262,9 +262,10 @@ EmuHandle* EmuHandle::CreateEmuHandle(EmuNtObject* ntObject) {
 	auto emuHandle = new EmuHandle(ntObject);
 
 	// Register EmuHandle
-	EmuHandleLookupLock.lock();
-	EmuHandleLookup.emplace(EmuHandleToHandle(emuHandle), emuHandle);
-	EmuHandleLookupLock.unlock();
+	{
+		const std::lock_guard<std::mutex> scopedLock(EmuHandleLookupLock);
+		EmuHandleLookup.emplace(EmuHandleToHandle(emuHandle), emuHandle);
+	}
 
 	return emuHandle;
 }
@@ -275,9 +276,8 @@ NTSTATUS EmuHandle::NtClose()
 
 	// Unregister the handle
 	if (status == STATUS_SUCCESS) {
-		EmuHandleLookupLock.lock();
+		const std::lock_guard<std::mutex> scopedLock(EmuHandleLookupLock);
 		EmuHandleLookup.erase(EmuHandleToHandle(this));
-		EmuHandleLookupLock.unlock();
 	}
 
 	return status;