Use StackView activation callbacks to perform init and cleanup since visibility callbacks aren't guaranteed to run in any order

app/gui/AppView.qml

@@ -20,35 +20,27 @@ GridView {
     anchors.bottomMargin: 5
     cellWidth: 225; cellHeight: 385;
 
-    // The StackView will trigger a visibility change when
-    // we're pushed onto it, causing our onVisibleChanged
-    // routine to run, but only if we start as invisible
-    visible: false
-
     function computerLost()
     {
         // Go back to the PC view on PC loss
         stackView.pop()
     }
 
-    Component.onCompleted: {
-        // Don't show any highlighted item until interacting with them
-        currentIndex = -1
-    }
-
     SdlGamepadKeyNavigation {
         id: gamepadKeyNav
     }
 
-    onVisibleChanged: {
+    StackView.onActivated: {
-        if (visible) {
+        appModel.computerLost.connect(computerLost)
-            appModel.computerLost.connect(computerLost)
+        gamepadKeyNav.enable()
-            gamepadKeyNav.enable()
+
-        }
+        // Don't show any highlighted item until interacting with them
-        else {
+        currentIndex = -1
-            appModel.computerLost.disconnect(computerLost)
+    }
-            gamepadKeyNav.disable()
+
-        }
+    StackView.onDeactivating: {
+        appModel.computerLost.disconnect(computerLost)
+        gamepadKeyNav.disable()
     }
 
     function createModel()

app/gui/CliQuitStreamSegue.qml

@@ -21,13 +21,8 @@ Item {
         errorDialog.open()
     }
 
-    // The StackView will trigger a visibility change when
+    StackView.onActivated: {
-    // we're pushed onto it, causing our onVisibleChanged
+        if (!launcher.isExecuted()) {
-    // routine to run, but only if we start as invisible
-    visible: false
-
-    onVisibleChanged: {
-        if (visible && !launcher.isExecuted()) {
             toolBar.visible = false
             launcher.searchingComputer.connect(onSearchingComputer)
             launcher.quittingApp.connect(onQuittingApp)

app/gui/CliStartStreamSegue.qml

@@ -6,8 +6,6 @@ import QtQuick.Dialogs 1.2
 import ComputerManager 1.0
 
 Item {
-    visible: false
-
     function onSearchingComputer() {
         stageLabel.text = "Establishing connection to PC..."
     }
@@ -36,8 +34,8 @@ Item {
         quitAppDialog.open()
     }
 
-    onVisibleChanged: {
+    StackView.onActivated: {
-        if (visible && !launcher.isExecuted()) {
+        if (!launcher.isExecuted()) {
             toolBar.visible = false
             launcher.searchingComputer.connect(onSearchingComputer)
             launcher.searchingApp.connect(onSearchingApp)

app/gui/PcView.qml

@@ -24,11 +24,6 @@ GridView {
     cellWidth: 350; cellHeight: 350;
     objectName: "Computers"
 
-    // The StackView will trigger a visibility change when
-    // we're pushed onto it, causing our onVisibleChanged
-    // routine to run, but only if we start as invisible
-    visible: false
-
     StreamingPreferences {
         id: prefs
     }
@@ -37,16 +32,9 @@ GridView {
         id: gamepadKeyNav
     }
 
-    onVisibleChanged: {
+    StackView.onActivated: {
-        if (visible) {
+        gamepadKeyNav.enable()
-            gamepadKeyNav.enable()
-        }
-        else {
-            gamepadKeyNav.disable()
-        }
-    }
 
-    Component.onCompleted: {
         // Setup signals on CM
         ComputerManager.computerAddCompleted.connect(addComplete)
 
@@ -54,6 +42,11 @@ GridView {
         currentIndex = -1
     }
 
+    StackView.onDeactivating: {
+        gamepadKeyNav.disable()
+        ComputerManager.computerAddCompleted.disconnect(addComplete)
+    }
+
     function pairingComplete(error)
     {
         // Close the PIN dialog

app/gui/QuitSegue.qml

@@ -14,11 +14,6 @@ Item {
 
     anchors.fill: parent
 
-    // The StackView will trigger a visibility change when
-    // we're pushed onto it, causing our onVisibleChanged
-    // routine to run, but only if we start as invisible
-    visible: false
-
     function quitAppCompleted(error)
     {
         // Display a failed dialog if we got an error
@@ -42,18 +37,17 @@ Item {
         }
     }
 
-    onVisibleChanged: {
+    StackView.onActivated: {
-        if (visible) {
+        // Hide the toolbar before we start loading
-            // Hide the toolbar before we start loading
+        toolBar.visible = false
-            toolBar.visible = false
 
-            // Connect the quit completion signal
+        // Connect the quit completion signal
-            ComputerManager.quitAppCompleted.connect(quitAppCompleted)
+        ComputerManager.quitAppCompleted.connect(quitAppCompleted)
-        }
+    }
-        else {
+
-            // Disconnect the signal
+    StackView.onDeactivating: {
-            ComputerManager.quitAppCompleted.disconnect(quitAppCompleted)
+        // Disconnect the signal
-        }
+        ComputerManager.quitAppCompleted.disconnect(quitAppCompleted)
     }
 
     Row {

app/gui/SettingsView.qml

@@ -28,26 +28,17 @@ Flickable {
         id: prefs
     }
 
-    // The StackView will trigger a visibility change when
-    // we're pushed onto it, causing our onVisibleChanged
-    // routine to run, but only if we start as invisible
-    visible: false
-
     SdlGamepadKeyNavigation {
         id: gamepadKeyNav
     }
 
-    onVisibleChanged: {
+    StackView.onActivated: {
-        if (visible) {
+        gamepadKeyNav.setSettingsMode(true)
-            gamepadKeyNav.setSettingsMode(true)
+        gamepadKeyNav.enable()
-            gamepadKeyNav.enable()
-        }
-        else {
-            gamepadKeyNav.disable()
-        }
     }
 
-    Component.onDestruction: {
+    StackView.onDeactivating: {
+        gamepadKeyNav.disable()
         prefs.save()
     }
 

app/gui/StreamSegue.qml

@@ -15,11 +15,6 @@ Item {
 
     anchors.fill: parent
 
-    // The StackView will trigger a visibility change when
-    // we're pushed onto it, causing our onVisibleChanged
-    // routine to run, but only if we start as invisible
-    visible: false
-
     function stageStarting(stage)
     {
         // Update the spinner text
@@ -105,35 +100,34 @@ Item {
         id: gamepadKeyNav
     }
 
-    onVisibleChanged: {
+    StackView.onActivated: {
-        if (visible) {
+        // Hide the toolbar before we start loading
-            // Hide the toolbar before we start loading
+        toolBar.visible = false
-            toolBar.visible = false
 
-            // Set the hint text. We do this here rather than
+        // Set the hint text. We do this here rather than
-            // in the hintText control itself to synchronize
+        // in the hintText control itself to synchronize
-            // with Session.exec() which requires no concurrent
+        // with Session.exec() which requires no concurrent
-            // gamepad usage.
+        // gamepad usage.
-            hintText.text = gamepadKeyNav.getConnectedGamepads() > 0 ?
+        hintText.text = gamepadKeyNav.getConnectedGamepads() > 0 ?
-                      "Tip: Press Start+Select+L1+R1 to disconnect your session" :
+                  "Tip: Press Start+Select+L1+R1 to disconnect your session" :
-                      "Tip: Press Ctrl+Alt+Shift+Q to disconnect your session"
+                  "Tip: Press Ctrl+Alt+Shift+Q to disconnect your session"
 
-            // Hook up our signals
+        // Hook up our signals
-            session.stageStarting.connect(stageStarting)
+        session.stageStarting.connect(stageStarting)
-            session.stageFailed.connect(stageFailed)
+        session.stageFailed.connect(stageFailed)
-            session.connectionStarted.connect(connectionStarted)
+        session.connectionStarted.connect(connectionStarted)
-            session.displayLaunchError.connect(displayLaunchError)
+        session.displayLaunchError.connect(displayLaunchError)
-            session.displayLaunchWarning.connect(displayLaunchWarning)
+        session.displayLaunchWarning.connect(displayLaunchWarning)
-            session.quitStarting.connect(quitStarting)
+        session.quitStarting.connect(quitStarting)
-            session.sessionFinished.connect(sessionFinished)
+        session.sessionFinished.connect(sessionFinished)
 
-            // Run the streaming session to completion
+        // Run the streaming session to completion
-            session.exec(Screen.virtualX, Screen.virtualY)
+        session.exec(Screen.virtualX, Screen.virtualY)
-        }
+    }
-        else if (!quitAfter) {
+
-            // Show the toolbar again when we become hidden
+    StackView.onDeactivating: {
-            toolBar.visible = true
+        // Show the toolbar again
-        }
+        toolBar.visible = true
     }
 
     Row {