From 0c40903f74dd0b45b4f40fb241af4a17ef4ee140 Mon Sep 17 00:00:00 2001 From: Connor McLaughlin Date: Mon, 2 Mar 2020 11:05:12 +1000 Subject: [PATCH] Qt: Fix double mutex lock on controller type change Fixes #39. --- src/duckstation-qt/qthostinterface.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/duckstation-qt/qthostinterface.cpp b/src/duckstation-qt/qthostinterface.cpp index 0e67a5425..296cfb307 100644 --- a/src/duckstation-qt/qthostinterface.cpp +++ b/src/duckstation-qt/qthostinterface.cpp @@ -324,7 +324,9 @@ void QtHostInterface::OnControllerTypeChanged(u32 slot) { HostInterface::OnControllerTypeChanged(slot); - updateInputMap(); + // this assumes the settings mutex is already locked - as it comes from updateSettings(). + QtSettingsInterface si(m_qsettings); + UpdateInputMap(si); } void QtHostInterface::updateInputMap()