Ensure SdlGamepadKeyNavigation is only re-enabled after the sessionFinished() callback to avoid conflicts with SdlInputHandler

This commit is contained in:
Cameron Gutman 2019-03-29 23:20:43 -07:00
parent f8e2740532
commit bc580c9aaa

View file

@ -21,8 +21,8 @@ Item {
function stageFailed(stage, errorCode) function stageFailed(stage, errorCode)
{ {
// Display the error dialog after Session::exec() returns
errorDialog.text = "Starting " + stage + " failed: Error " + errorCode errorDialog.text = "Starting " + stage + " failed: Error " + errorCode
errorDialog.open()
} }
function connectionStarted() function connectionStarted()
@ -66,6 +66,9 @@ Item {
function sessionFinished() function sessionFinished()
{ {
// Enable GUI gamepad usage now
SdlGamepadKeyNavigation.enable()
if (quitAfter) { if (quitAfter) {
if (errorDialog.text) { if (errorDialog.text) {
// Quit when the error dialog is acknowledged // Quit when the error dialog is acknowledged
@ -178,10 +181,6 @@ Item {
if (!visible && quitAfter) { if (!visible && quitAfter) {
Qt.quit() Qt.quit()
} }
else {
// Enable GUI gamepad usage now
SdlGamepadKeyNavigation.enable()
}
} }
onHelp: { onHelp: {