From 94038a1e03dae76ea9560766b07d79ba45c67f1a Mon Sep 17 00:00:00 2001 From: Michael Maltese Date: Tue, 13 Jun 2017 16:52:55 -0700 Subject: [PATCH] MappingButton: remove GetFirstButtonPress logic --- .../Core/DolphinQt2/Config/Mapping/MappingButton.cpp | 5 ----- .../Core/DolphinQt2/Config/Mapping/MappingWidget.cpp | 10 ---------- Source/Core/DolphinQt2/Config/Mapping/MappingWidget.h | 1 - 3 files changed, 16 deletions(-) diff --git a/Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp b/Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp index 02e6917d8c..cd776f6cbb 100644 --- a/Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp +++ b/Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp @@ -42,13 +42,8 @@ void MappingButton::OnButtonPressed() setText(QStringLiteral("...")); - Common::SleepCurrentThread(100); - SetBlockInputs(true); - if (m_parent->GetFirstButtonPress()) - m_reference->Detect(10, dev.get()); - // Avoid that the button press itself is registered as an event Common::SleepCurrentThread(100); diff --git a/Source/Core/DolphinQt2/Config/Mapping/MappingWidget.cpp b/Source/Core/DolphinQt2/Config/Mapping/MappingWidget.cpp index ff7e7c1e20..c2d64e6ee5 100644 --- a/Source/Core/DolphinQt2/Config/Mapping/MappingWidget.cpp +++ b/Source/Core/DolphinQt2/Config/Mapping/MappingWidget.cpp @@ -114,16 +114,6 @@ void MappingWidget::Update() LoadSettings(); } -bool MappingWidget::GetFirstButtonPress() -{ - if (m_first) - { - m_first = false; - return true; - } - return false; -} - ControllerEmu::EmulatedController* MappingWidget::GetController() const { return m_parent->GetController(); diff --git a/Source/Core/DolphinQt2/Config/Mapping/MappingWidget.h b/Source/Core/DolphinQt2/Config/Mapping/MappingWidget.h index a942038b3f..81dd605628 100644 --- a/Source/Core/DolphinQt2/Config/Mapping/MappingWidget.h +++ b/Source/Core/DolphinQt2/Config/Mapping/MappingWidget.h @@ -51,7 +51,6 @@ public: virtual InputConfig* GetConfig() = 0; void Update(); - bool GetFirstButtonPress(); protected: int GetPort() const;