summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinQt/Config/Mapping/MappingIndicator.cpp
diff options
context:
space:
mode:
authorConnor McLaughlin <stenzek@gmail.com>2019-11-11 10:59:49 +1000
committerGitHub <noreply@github.com>2019-11-11 10:59:49 +1000
commit913cb080667302760e42e3a6e2346b6e7c5cb1b6 (patch)
tree66ff102774c387e743c535f5c79a55736e05c3b9 /Source/Core/DolphinQt/Config/Mapping/MappingIndicator.cpp
parent066012b80d7a149779b4e910dcda3be8ec97f8e3 (diff)
parent85ceb37ccd24acc5ea026583ce3a0f6a4fb26eaa (diff)
Merge pull request #8456 from jordan-woyak/input-gate-race-fix
InputCommon: Make the "input gate" not racy.
Diffstat (limited to 'Source/Core/DolphinQt/Config/Mapping/MappingIndicator.cpp')
-rw-r--r--Source/Core/DolphinQt/Config/Mapping/MappingIndicator.cpp8
1 files changed, 0 insertions, 8 deletions
diff --git a/Source/Core/DolphinQt/Config/Mapping/MappingIndicator.cpp b/Source/Core/DolphinQt/Config/Mapping/MappingIndicator.cpp
index 6468d8049d..735c864a2d 100644
--- a/Source/Core/DolphinQt/Config/Mapping/MappingIndicator.cpp
+++ b/Source/Core/DolphinQt/Config/Mapping/MappingIndicator.cpp
@@ -27,7 +27,6 @@
#include "DolphinQt/Config/Mapping/MappingWidget.h"
#include "DolphinQt/QtUtils/ModalMessageBox.h"
-#include "DolphinQt/Settings.h"
namespace
{
@@ -589,9 +588,6 @@ void MappingIndicator::DrawForce(ControllerEmu::Force& force)
void MappingIndicator::paintEvent(QPaintEvent*)
{
- // TODO: The SetControllerStateNeeded interface leaks input into the game.
- Settings::Instance().SetControllerStateNeeded(true);
-
switch (m_group->type)
{
case ControllerEmu::GroupType::Cursor:
@@ -610,8 +606,6 @@ void MappingIndicator::paintEvent(QPaintEvent*)
default:
break;
}
-
- Settings::Instance().SetControllerStateNeeded(false);
}
ShakeMappingIndicator::ShakeMappingIndicator(ControllerEmu::Shake* group)
@@ -621,9 +615,7 @@ ShakeMappingIndicator::ShakeMappingIndicator(ControllerEmu::Shake* group)
void ShakeMappingIndicator::paintEvent(QPaintEvent*)
{
- Settings::Instance().SetControllerStateNeeded(true);
DrawShake();
- Settings::Instance().SetControllerStateNeeded(false);
}
void ShakeMappingIndicator::DrawShake()