Only push PlaybackPage if the BrowsePage is the current page

[xinema.git] / remote / qml / pages / BrowsePage.qml

diff --git a/remote/qml/pages/BrowsePage.qml b/remote/qml/pages/BrowsePage.qml
index d1b74e606b7f1b34983c78be4532b27692adeece..8a5d254b60edb5c8443a2895be3dea8a8ef9a4d5 100644 (file)
--- a/remote/qml/pages/BrowsePage.qml
+++ b/remote/qml/pages/BrowsePage.qml
@@ -1,5 +1,6 @@
 import QtQuick 2.0
 import Sailfish.Silica 1.0
+import org.nemomobile.configuration 1.0
 import fi.mikkosoft.xinema 0.1
 
 Page
@@ -35,6 +36,8 @@ Page
                        MenuItem
                        {
                                text: "Set as default location"
+
+                               onClicked: defaultLocation.value = browseDirectory.directory
                        }
 
                        MenuItem
@@ -92,7 +95,7 @@ Page
        Component.onCompleted:
        {
                if(xinemaControl.connected)
-                       browseDirectory.directory = "/";
+                       browseDirectory.directory = defaultLocation.value;
        }
 
        StreamControl
@@ -101,7 +104,7 @@ Page
                control: xinemaControl
                onPlaybackStateChanged:
                {
-                       if(playbackState==StreamControl.Playing)
+                       if(playbackState==StreamControl.Playing && pageContainer.currentPage==page)
                        {
                                if(pageContainer.busy)
                                        pageContainer.completeAnimation();
@@ -109,5 +112,12 @@ Page
                        }
                }
        }
+
+       ConfigurationValue
+       {
+               id: defaultLocation
+               key: "/fi/mikkosoft/xinema-remote/defaultLocation"
+               defaultValue: "/"
+       }
 }