Merge pull request #4828 from lioncash/lockguard
general: Use template deduction guides for lock_guard
This commit is contained in:
commit
ae3a755d13
@ -84,7 +84,7 @@ void ProgressServiceBackend::FinishDownload(ResultCode result) {
|
|||||||
|
|
||||||
void ProgressServiceBackend::SignalUpdate() const {
|
void ProgressServiceBackend::SignalUpdate() const {
|
||||||
if (need_hle_lock) {
|
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();
|
event.writable->Signal();
|
||||||
} else {
|
} else {
|
||||||
event.writable->Signal();
|
event.writable->Signal();
|
||||||
|
@ -596,6 +596,6 @@ void QtControllerSelector::ReconfigureControllers(
|
|||||||
|
|
||||||
void QtControllerSelector::MainWindowReconfigureFinished() {
|
void QtControllerSelector::MainWindowReconfigureFinished() {
|
||||||
// Acquire the HLE mutex
|
// Acquire the HLE mutex
|
||||||
std::lock_guard<std::recursive_mutex> lock(HLE::g_hle_lock);
|
std::lock_guard lock(HLE::g_hle_lock);
|
||||||
callback();
|
callback();
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user