diff options
| author | 2022-01-18 18:45:57 -0600 | |
|---|---|---|
| committer | 2022-04-16 00:49:26 -0500 | |
| commit | 46e1c5bc373734e29842ad1781a1ff266a4cd43d (patch) | |
| tree | 9874261b3bc853f33e3fd2194fbade08217faf5a /src | |
| parent | yuzu: Add custom ringcon configuration (diff) | |
| download | yuzu-46e1c5bc373734e29842ad1781a1ff266a4cd43d.tar.gz yuzu-46e1c5bc373734e29842ad1781a1ff266a4cd43d.tar.xz yuzu-46e1c5bc373734e29842ad1781a1ff266a4cd43d.zip | |
yuzu: Call ignore event after ensuring it's initialized
Diffstat (limited to 'src')
| -rw-r--r-- | src/yuzu/configuration/configure_input_player.cpp | 2 | ||||
| -rw-r--r-- | src/yuzu/configuration/configure_ringcon.cpp | 2 |
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) { | |||
| 1407 | } | 1407 | } |
| 1408 | 1408 | ||
| 1409 | void ConfigureInputPlayer::keyPressEvent(QKeyEvent* event) { | 1409 | void ConfigureInputPlayer::keyPressEvent(QKeyEvent* event) { |
| 1410 | event->ignore(); | ||
| 1411 | if (!input_setter || !event) { | 1410 | if (!input_setter || !event) { |
| 1412 | return; | 1411 | return; |
| 1413 | } | 1412 | } |
| 1413 | event->ignore(); | ||
| 1414 | if (event->key() != Qt::Key_Escape) { | 1414 | if (event->key() != Qt::Key_Escape) { |
| 1415 | input_subsystem->GetKeyboard()->PressKey(event->key()); | 1415 | input_subsystem->GetKeyboard()->PressKey(event->key()); |
| 1416 | } | 1416 | } |
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) { | |||
| 305 | } | 305 | } |
| 306 | 306 | ||
| 307 | void ConfigureRingController::keyPressEvent(QKeyEvent* event) { | 307 | void ConfigureRingController::keyPressEvent(QKeyEvent* event) { |
| 308 | event->ignore(); | ||
| 309 | if (!input_setter || !event) { | 308 | if (!input_setter || !event) { |
| 310 | return; | 309 | return; |
| 311 | } | 310 | } |
| 311 | event->ignore(); | ||
| 312 | if (event->key() != Qt::Key_Escape) { | 312 | if (event->key() != Qt::Key_Escape) { |
| 313 | input_subsystem->GetKeyboard()->PressKey(event->key()); | 313 | input_subsystem->GetKeyboard()->PressKey(event->key()); |
| 314 | } | 314 | } |