M CHANGES → CHANGES

@@ -40,6 +40,7 @@ - GBA Video: Fix sprite boundary conditions with mosaic
  - Video: Fix FFmpeg crashing when the file extension is wrong
  - GBA Audio: Fix GB audio channels being too quiet (fixes #159)
  - Qt: Fix a race condition when a game crashes immediately
+ - Qt: Fix some cases where key mapping can break if focus is adjusted
 Misc:
  - Qt: Disable sync to video by default
  - GBA: Exit cleanly on FATAL if the port supports it

M src/platform/qt/GBAKeyEditor.cpp → src/platform/qt/GBAKeyEditor.cpp

@@ -143,12 +143,10 @@ painter.drawPicture(0, 0, m_background);
 }
 
 void GBAKeyEditor::setNext() {
+	findFocus();
+
 	if (m_currentKey == m_keyOrder.end()) {
 		return;
-	}
-
-	if (!(*m_currentKey)->hasFocus()) {
-		m_currentKey = m_keyOrder.end();
 	}
 
 	++m_currentKey;