diff options
| author | Léo Lam <leo@innovatetechnologi.es> | 2019-11-08 22:15:45 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-08 22:15:45 +0100 |
| commit | d8c62b5965df694fb5f93b617e356cae1f9441b7 (patch) | |
| tree | 14f2de06ba74ad4d06724715b3c9ba8c431f32cf /Source/Core/DolphinQt/Config/Mapping/MappingIndicator.cpp | |
| parent | 0ff99b374ea6d024713a5ea562dfcb101f5b47b3 (diff) | |
| parent | 40d15980c5b90c96bf5a433a9861b03791a96581 (diff) | |
Merge pull request #8396 from jordan-woyak/mapping-input-list-states
Qt/Mapping: Show current input states in advanced dialog.
Diffstat (limited to 'Source/Core/DolphinQt/Config/Mapping/MappingIndicator.cpp')
| -rw-r--r-- | Source/Core/DolphinQt/Config/Mapping/MappingIndicator.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/DolphinQt/Config/Mapping/MappingIndicator.cpp b/Source/Core/DolphinQt/Config/Mapping/MappingIndicator.cpp index a1d0eb144c..6b2b83d2ab 100644 --- a/Source/Core/DolphinQt/Config/Mapping/MappingIndicator.cpp +++ b/Source/Core/DolphinQt/Config/Mapping/MappingIndicator.cpp @@ -105,7 +105,7 @@ MappingIndicator::MappingIndicator(ControllerEmu::ControlGroup* group) : m_group // TODO: Make these magic numbers less ugly. int required_height = 106; - if (ControllerEmu::GroupType::MixedTriggers == group->type) + if (group && ControllerEmu::GroupType::MixedTriggers == group->type) required_height = 64 + 1; setFixedHeight(required_height); |
