ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6810 from spycrab/qt_fix_hotkey_conf 

Qt/MappingButton: Fix occasionally broken indicator
This commit is contained in:
spycrab 2018-05-11 21:05:43 +02:00 committed by GitHub
parent e942b14676 242fadc76f
commit 76f6c7523f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp
View File

@ -12,12 +12,15 @@
#include "DolphinQt2/Config/Mapping/MappingButton.h" #include "DolphinQt2/Config/Mapping/MappingButton.h"
#include "Common/Thread.h" #include "Common/Thread.h"
#include "Core/Core.h"
#include "DolphinQt2/Config/Mapping/IOWindow.h" #include "DolphinQt2/Config/Mapping/IOWindow.h"
#include "DolphinQt2/Config/Mapping/MappingCommon.h" #include "DolphinQt2/Config/Mapping/MappingCommon.h"
#include "DolphinQt2/Config/Mapping/MappingWidget.h" #include "DolphinQt2/Config/Mapping/MappingWidget.h"
#include "DolphinQt2/Config/Mapping/MappingWindow.h" #include "DolphinQt2/Config/Mapping/MappingWindow.h"
#include "DolphinQt2/QtUtils/BlockUserInputFilter.h" #include "DolphinQt2/QtUtils/BlockUserInputFilter.h"
#include "DolphinQt2/Settings.h" #include "DolphinQt2/Settings.h"
#include "InputCommon/ControlReference/ControlReference.h" #include "InputCommon/ControlReference/ControlReference.h"
#include "InputCommon/ControllerEmu/ControllerEmu.h" #include "InputCommon/ControllerEmu/ControllerEmu.h"
#include "InputCommon/ControllerInterface/ControllerInterface.h" #include "InputCommon/ControllerInterface/ControllerInterface.h"
@ -52,6 +55,9 @@ MappingButton::MappingButton(MappingWidget* widget, ControlReference* ref, bool
Settings::Instance().SetControllerStateNeeded(true); Settings::Instance().SetControllerStateNeeded(true);
if (Core::GetState() == Core::State::Uninitialized || Core::GetState() == Core::State::Paused)
g_controller_interface.UpdateInput();
auto state = m_reference->State(); auto state = m_reference->State();
QFont f = m_parent->font(); QFont f = m_parent->font();