aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels
diff options
context:
space:
mode:
authorShlomo Hecht <shlomo@twine-s.com>2020-02-26 10:45:48 +0200
committerShlomo Hecht <shlomo@twine-s.com>2020-02-26 10:45:48 +0200
commit5cedf7cc7de176c6b3ecdcef9b7ad1382400e880 (patch)
tree9467e3fcc6a915d762ae2bd591d6a09c28c47be0 /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels
parent7760263b9271356a676af6ba596a41eb190c858c (diff)
parent61f2658295193dca0fdaa58744925d90bd2f4044 (diff)
downloadTango-5cedf7cc7de176c6b3ecdcef9b7ad1382400e880.tar.gz
Tango-5cedf7cc7de176c6b3ecdcef9b7ad1382400e880.zip
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels')
-rw-r--r--Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs9
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);
}
}