From d5770ad8cc2bb8f0c24edf5f7de62a3048359f92 Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Sun, 30 Sep 2018 18:38:54 -0700
Subject: [PATCH] Fix "Connection terminated" dialog being stuck out of input
 focus on gamepad

---
 app/gui/StreamSegue.qml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/gui/StreamSegue.qml b/app/gui/StreamSegue.qml
index 686aecf0..013a6832 100644
--- a/app/gui/StreamSegue.qml
+++ b/app/gui/StreamSegue.qml
@@ -43,8 +43,8 @@ Item {
 
     function displayLaunchError(text)
     {
+        // Display the error dialog after Session::exec() returns
         errorDialog.text = text
-        errorDialog.open()
     }
 
     function displayLaunchWarning(text)
@@ -81,6 +81,14 @@ Item {
 
                 // Exit this view
                 stackView.pop()
+
+                // Display any launch errors. We do this after
+                // the Qt UI is visible again to prevent losing
+                // focus on the dialog which would impact gamepad
+                // users.
+                if (errorDialog.text) {
+                    errorDialog.open()
+                }
             }
         }
         else {