summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNarr the Reg <juangerman-13@hotmail.com>2022-01-19 01:45:57 +0100
committerNarr the Reg <juangerman-13@hotmail.com>2022-04-16 07:49:26 +0200
commit46e1c5bc373734e29842ad1781a1ff266a4cd43d (patch)
tree9874261b3bc853f33e3fd2194fbade08217faf5a
parentyuzu: Add custom ringcon configuration (diff)
downloadyuzu-46e1c5bc373734e29842ad1781a1ff266a4cd43d.tar
yuzu-46e1c5bc373734e29842ad1781a1ff266a4cd43d.tar.gz
yuzu-46e1c5bc373734e29842ad1781a1ff266a4cd43d.tar.bz2
yuzu-46e1c5bc373734e29842ad1781a1ff266a4cd43d.tar.lz
yuzu-46e1c5bc373734e29842ad1781a1ff266a4cd43d.tar.xz
yuzu-46e1c5bc373734e29842ad1781a1ff266a4cd43d.tar.zst
yuzu-46e1c5bc373734e29842ad1781a1ff266a4cd43d.zip
-rw-r--r--src/yuzu/configuration/configure_input_player.cpp2
-rw-r--r--src/yuzu/configuration/configure_ringcon.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/yuzu/configuration/configure_input_player.cpp b/src/yuzu/configuration/configure_input_player.cpp
index 8ef3596dd..291e37acf 100644
--- a/src/yuzu/configuration/configure_input_player.cpp
+++ b/src/yuzu/configuration/configure_input_player.cpp
@@ -1407,10 +1407,10 @@ void ConfigureInputPlayer::mousePressEvent(QMouseEvent* event) {
}
void ConfigureInputPlayer::keyPressEvent(QKeyEvent* event) {
- event->ignore();
if (!input_setter || !event) {
return;
}
+ event->ignore();
if (event->key() != Qt::Key_Escape) {
input_subsystem->GetKeyboard()->PressKey(event->key());
}
diff --git a/src/yuzu/configuration/configure_ringcon.cpp b/src/yuzu/configuration/configure_ringcon.cpp
index 144e2b83f..f1cdd4fed 100644
--- a/src/yuzu/configuration/configure_ringcon.cpp
+++ b/src/yuzu/configuration/configure_ringcon.cpp
@@ -305,10 +305,10 @@ void ConfigureRingController::mousePressEvent(QMouseEvent* event) {
}
void ConfigureRingController::keyPressEvent(QKeyEvent* event) {
- event->ignore();
if (!input_setter || !event) {
return;
}
+ event->ignore();
if (event->key() != Qt::Key_Escape) {
input_subsystem->GetKeyboard()->PressKey(event->key());
}