VERY experimental Nintendo Switch 2 emulator
C++
qt_software_keyboard: Fix infinite loop when moving between buttons
Morphd3e35cd46223
diff --git a/src/yuzu/applets/qt_software_keyboard.cpp b/src/yuzu/applets/qt_software_keyboard.cppindex 91dca2760f..e60506197f 100644--- a/src/yuzu/applets/qt_software_keyboard.cpp+++ b/src/yuzu/applets/qt_software_keyboard.cpp@@ -1401,6 +1401,10 @@ void QtSoftwareKeyboardDialog::MoveButtonDirection(Direction direction) {}};+ // Store the initial row and column.+ const auto initial_row = row;+ const auto initial_column = column;+switch (bottom_osk_index) {case BottomOSKIndex::LowerCase:case BottomOSKIndex::UpperCase: {@@ -1411,6 +1415,11 @@ void QtSoftwareKeyboardDialog::MoveButtonDirection(Direction direction) {auto* curr_button = keyboard_buttons[index][row][column];while (!curr_button || !curr_button->isEnabled() || curr_button == prev_button) {+ // If we returned back to where we started from, break the loop.+ if (row == initial_row && column == initial_column) {+ break;+ }+move_direction(NUM_ROWS_NORMAL, NUM_COLUMNS_NORMAL);curr_button = keyboard_buttons[index][row][column];}@@ -1425,6 +1434,11 @@ void QtSoftwareKeyboardDialog::MoveButtonDirection(Direction direction) {auto* curr_button = numberpad_buttons[row][column];while (!curr_button || !curr_button->isEnabled() || curr_button == prev_button) {+ // If we returned back to where we started from, break the loop.+ if (row == initial_row && column == initial_column) {+ break;+ }+move_direction(NUM_ROWS_NUMPAD, NUM_COLUMNS_NUMPAD);curr_button = numberpad_buttons[row][column];}