Browse Source
Merge pull request #4828 from lioncash/lockguard
general: Use template deduction guides for lock_guard
pull/15/merge
Rodrigo Locatti
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
2 additions and
2 deletions
-
src/core/hle/service/bcat/backend/backend.cpp
-
src/yuzu/applets/controller.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(); |
|
|
|
|
|
|
|
@ -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(); |
|
|
|
} |