diff options
| author |  german77 | 2021-11-04 13:08:30 -0600 |
|---|---|---|
| committer | Narr the Reg | 2021-11-24 20:30:27 -0600 |
| commit | d14e74132ceaa8b5efef8a7d543cb50429cb4fb3 (patch) | |
| tree | b59b5034ac0262d84da6dbeb7496c83e282b80f8 /src/core/hid/emulated_controller.cpp | |
| parent | core/hid: Rename NpadType to NpadStyleIndex (diff) | |
| download | yuzu-d14e74132ceaa8b5efef8a7d543cb50429cb4fb3.tar.gz yuzu-d14e74132ceaa8b5efef8a7d543cb50429cb4fb3.tar.xz yuzu-d14e74132ceaa8b5efef8a7d543cb50429cb4fb3.zip | |
settings: Fix controller preview not displaying the correct controller
Diffstat (limited to 'src/core/hid/emulated_controller.cpp')
| -rw-r--r-- | src/core/hid/emulated_controller.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/hid/emulated_controller.cpp b/src/core/hid/emulated_controller.cpp index a200992f2..a9038e06f 100644 --- a/src/core/hid/emulated_controller.cpp +++ b/src/core/hid/emulated_controller.cpp | |||
| @@ -880,7 +880,7 @@ void EmulatedController::Disconnect() { | |||
| 880 | } | 880 | } |
| 881 | 881 | ||
| 882 | bool EmulatedController::IsConnected(bool get_temporary_value) const { | 882 | bool EmulatedController::IsConnected(bool get_temporary_value) const { |
| 883 | if (get_temporary_value) { | 883 | if (get_temporary_value && is_configuring) { |
| 884 | return tmp_is_connected; | 884 | return tmp_is_connected; |
| 885 | } | 885 | } |
| 886 | return is_connected; | 886 | return is_connected; |
| @@ -897,7 +897,7 @@ NpadIdType EmulatedController::GetNpadIdType() const { | |||
| 897 | } | 897 | } |
| 898 | 898 | ||
| 899 | NpadStyleIndex EmulatedController::GetNpadStyleIndex(bool get_temporary_value) const { | 899 | NpadStyleIndex EmulatedController::GetNpadStyleIndex(bool get_temporary_value) const { |
| 900 | if (get_temporary_value) { | 900 | if (get_temporary_value && is_configuring) { |
| 901 | return tmp_npad_type; | 901 | return tmp_npad_type; |
| 902 | } | 902 | } |
| 903 | return npad_type; | 903 | return npad_type; |