summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorgerman77 <juangerman-13@hotmail.com>2021-11-04 20:08:30 +0100
committerNarr the Reg <juangerman-13@hotmail.com>2021-11-25 03:30:27 +0100
commitd14e74132ceaa8b5efef8a7d543cb50429cb4fb3 (patch)
treeb59b5034ac0262d84da6dbeb7496c83e282b80f8 /src/core
parentcore/hid: Rename NpadType to NpadStyleIndex (diff)
downloadyuzu-d14e74132ceaa8b5efef8a7d543cb50429cb4fb3.tar
yuzu-d14e74132ceaa8b5efef8a7d543cb50429cb4fb3.tar.gz
yuzu-d14e74132ceaa8b5efef8a7d543cb50429cb4fb3.tar.bz2
yuzu-d14e74132ceaa8b5efef8a7d543cb50429cb4fb3.tar.lz
yuzu-d14e74132ceaa8b5efef8a7d543cb50429cb4fb3.tar.xz
yuzu-d14e74132ceaa8b5efef8a7d543cb50429cb4fb3.tar.zst
yuzu-d14e74132ceaa8b5efef8a7d543cb50429cb4fb3.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/hid/emulated_controller.cpp4
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() {
}
bool EmulatedController::IsConnected(bool get_temporary_value) const {
- if (get_temporary_value) {
+ if (get_temporary_value && is_configuring) {
return tmp_is_connected;
}
return is_connected;
@@ -897,7 +897,7 @@ NpadIdType EmulatedController::GetNpadIdType() const {
}
NpadStyleIndex EmulatedController::GetNpadStyleIndex(bool get_temporary_value) const {
- if (get_temporary_value) {
+ if (get_temporary_value && is_configuring) {
return tmp_npad_type;
}
return npad_type;