mirror of
https://github.com/moonlight-stream/moonlight-qt
synced 2024-12-13 21:02:28 +00:00
Ensure SdlGamepadKeyNavigation is only re-enabled after the sessionFinished() callback to avoid conflicts with SdlInputHandler
This commit is contained in:
parent
f8e2740532
commit
bc580c9aaa
1 changed files with 4 additions and 5 deletions
|
@ -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: {
|
||||||
|
|
Loading…
Reference in a new issue