merge conflicts

1 files changed, 6 insertions, 3 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
index 4d37321dd..46491c823 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
@@ -737,7 +737,7 @@ namespace Tango.MachineStudio.UI.ViewModels
         /// Opens the module in a new window.
         /// </summary>
         /// <param name="module">The module.</param>
-        private async void OpenModuleInWindow(IStudioModule module, Rect? bounds = null, WindowState? state = null)
+        private async void OpenModuleInWindow(IStudioModule module, Rect? bounds = null, WindowState? state = null, bool setHomeModule = true)
         {
             if (module == null) return;
 
@@ -745,7 +745,10 @@ namespace Tango.MachineStudio.UI.ViewModels
             {
                 module.InNewWindow = true;
 
-                StartModule(null);
+                if (setHomeModule)
+                {
+                    StartModule(null);
+                }
 
                 await Task.Delay(1000);
 
@@ -943,7 +946,7 @@ namespace Tango.MachineStudio.UI.ViewModels
 
                         if (module != null && !module.InNewWindow)
                         {
-                            OpenModuleInWindow(module, item.Bounds, item.State);
+                            OpenModuleInWindow(module, item.Bounds, item.State, false);
                         }
                     }