summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRodrigo Locatti <reinuseslisp@airmail.cc>2020-10-25 20:55:54 +0100
committerGitHub <noreply@github.com>2020-10-25 20:55:54 +0100
commitae3a755d137f4c4568b72111fe8471d2408c414c (patch)
treea714cafe328396d0e80bad2645e77ebff50fa252 /src
parentMerge pull request #4826 from Morph1984/resolve-warning (diff)
parentgeneral: Use template deduction guides for lock_guard (diff)
downloadyuzu-ae3a755d137f4c4568b72111fe8471d2408c414c.tar
yuzu-ae3a755d137f4c4568b72111fe8471d2408c414c.tar.gz
yuzu-ae3a755d137f4c4568b72111fe8471d2408c414c.tar.bz2
yuzu-ae3a755d137f4c4568b72111fe8471d2408c414c.tar.lz
yuzu-ae3a755d137f4c4568b72111fe8471d2408c414c.tar.xz
yuzu-ae3a755d137f4c4568b72111fe8471d2408c414c.tar.zst
yuzu-ae3a755d137f4c4568b72111fe8471d2408c414c.zip
Diffstat (limited to '')
-rw-r--r--src/core/hle/service/bcat/backend/backend.cpp2
-rw-r--r--src/yuzu/applets/controller.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/core/hle/service/bcat/backend/backend.cpp b/src/core/hle/service/bcat/backend/backend.cpp
index def3410cc..174388445 100644
--- a/src/core/hle/service/bcat/backend/backend.cpp
+++ b/src/core/hle/service/bcat/backend/backend.cpp
@@ -84,7 +84,7 @@ void ProgressServiceBackend::FinishDownload(ResultCode result) {
void ProgressServiceBackend::SignalUpdate() const {
if (need_hle_lock) {
- std::lock_guard<std::recursive_mutex> lock(HLE::g_hle_lock);
+ std::lock_guard lock(HLE::g_hle_lock);
event.writable->Signal();
} else {
event.writable->Signal();
diff --git a/src/yuzu/applets/controller.cpp b/src/yuzu/applets/controller.cpp
index 9d45f2a01..2760487a3 100644
--- a/src/yuzu/applets/controller.cpp
+++ b/src/yuzu/applets/controller.cpp
@@ -596,6 +596,6 @@ void QtControllerSelector::ReconfigureControllers(
void QtControllerSelector::MainWindowReconfigureFinished() {
// Acquire the HLE mutex
- std::lock_guard<std::recursive_mutex> lock(HLE::g_hle_lock);
+ std::lock_guard lock(HLE::g_hle_lock);
callback();
}