1 files changed, 28 insertions, 14 deletions

diff --git a/src/main.qml b/src/main.qml
index 4a0706f..a30ed35 100644
--- a/src/main.qml
+++ b/src/main.qml
@@ -67,6 +67,27 @@ ApplicationWindow {
         console.log("Opening window now...");
     }
 
+    function main_content_pop(item, operation) {
+        if(item) {
+            if(item.search(main_content.currentItem.objectName) >= 0) return
+        }
+        return main_content.pop(item, operation)
+    }
+
+    function main_content_push(item, operation) {
+        if(item) {
+            if(item.search(main_content.currentItem.objectName) >= 0) return
+        }
+        return main_content.push(item, operation)
+    }
+
+    function main_content_replace(item, operation) {
+        if(item) {
+            if(item.search(main_content.currentItem.objectName) >= 0) return
+        }
+        return main_content.replace(item, operation)
+    }
+
     MessageDialog {
         id: message_dialog
         objectName: "message_dialog"
@@ -89,9 +110,10 @@ ApplicationWindow {
         }
     }
 
-
     StackView {
         id: main_content
+        objectName: "main_content"
+
         anchors.top: top_menu_bar_frame.bottom
         anchors.right: parent.right
         anchors.bottom: parent.bottom
@@ -191,9 +213,7 @@ ApplicationWindow {
                     header_text.text = qsTr("Settings")
                     if(inPortrait) sidebar_drawer.close()
 
-                    if(scene_url.search(main_content.currentItem.objectName) <= 0) {
-                        main_content.replace(scene_url)
-                    }
+                    main_content_replace(scene_url, StackView.Transition)
                 }
 
                 MenuSeparator {
@@ -212,9 +232,7 @@ ApplicationWindow {
                         header_text.text = qsTr("Allow remote control")
                         if(inPortrait) sidebar_drawer.close()
 
-                        if(scene_url.search(main_content.currentItem.objectName) <= 0) {
-                            main_content.replace(scene_url)
-                        }
+                        main_content_replace(scene_url, StackView.Transition)
                     }
                 }
                 ListItem {
@@ -224,21 +242,17 @@ ApplicationWindow {
                         header_text.text = qsTr("Allow remote view")
                         if(inPortrait) sidebar_drawer.close()
 
-                        if(scene_url.search(main_content.currentItem.objectName) <= 0) {
-                            main_content.replace(scene_url)
-                        }
+                        main_content_replace(scene_url, StackView.Transition)
                     }
                 }
                 ListItem {
                     text: " " + qsTr("Add RWA-Server")
-                    scene_url: "scenes/Scene_placeholder.qml"
+                    scene_url: "scenes/add_server_wizard/Scene_step_1.qml"
                     onListItemClick: {
                         header_text.text = qsTr("Server addition wizard")
                         if(inPortrait) sidebar_drawer.close()
 
-                        if(scene_url.search(main_content.currentItem.objectName) <= 0) {
-                            main_content.replace(scene_url)
-                        }
+                        main_content_replace(scene_url, StackView.Transition)
                     }
                 }
             }