1 files changed, 25 insertions, 20 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs
index bb6a3c467..6da1cf64b 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs
@@ -444,23 +444,7 @@ namespace Tango.MachineStudio.RML.ViewModels
                         .WithSpools()
                         .BuildAsync();
 
-                    if (ActiveRML.Cct != null)
-                    {
-                        _selectedCCT = CCTS.SingleOrDefault(x => x.Guid == ActiveRML.Cct.Guid);
-                        RaisePropertyChanged(nameof(SelectedCCT));
-                    }
-
-                    if (ActiveRML.Gbd != null)
-                    {
-                        _selectedGBD = GBDS.SingleOrDefault(x => x.Guid == ActiveRML.Gbd.Guid);
-                        RaisePropertyChanged(nameof(SelectedGBD));
-                    }
-
-                    if (ActiveRML.Lub != null)
-                    {
-                        _selectedLUB = LUBS.SingleOrDefault(x => x.Guid == ActiveRML.Lub.Guid);
-                        RaisePropertyChanged(nameof(SelectedLUB));
-                    }
+                    InvalidateRelayCommands();
 
                     if (ActiveRML.ProcessParametersTablesGroups.ToList().Count == 0)
                     {
@@ -526,6 +510,27 @@ namespace Tango.MachineStudio.RML.ViewModels
                         LiquidTypesRmls = LiquidTypesRmls,
                     };
 
+                    if (ActiveRML.Cct != null)
+                    {
+                        _selectedCCT = CCTS.SingleOrDefault(x => x.Guid == ActiveRML.Cct.Guid);
+                        await OnSelectedCCTChanged();
+                        RaisePropertyChanged(nameof(SelectedCCT));
+                    }
+
+                    if (ActiveRML.Gbd != null)
+                    {
+                        _selectedGBD = GBDS.SingleOrDefault(x => x.Guid == ActiveRML.Gbd.Guid);
+                        await OnSelectedGBDChanged();
+                        RaisePropertyChanged(nameof(SelectedGBD));
+                    }
+
+                    if (ActiveRML.Lub != null)
+                    {
+                        _selectedLUB = LUBS.SingleOrDefault(x => x.Guid == ActiveRML.Lub.Guid);
+                        await OnSelectedLUBChanged();
+                        RaisePropertyChanged(nameof(SelectedLUB));
+                    }
+
                     ColorCalibrationVM = new ColorCalibrationViewVM(_notification)
                     {
                         RML = ActiveRML,
@@ -554,7 +559,7 @@ namespace Tango.MachineStudio.RML.ViewModels
 
         private async Task OnSelectedCCTChanged()
         {
-            if (SelectedCCT != null && !SelectedCCT.IsNew)
+            if (ColorConversionViewVM != null && SelectedCCT != null && !SelectedCCT.IsNew)
             {
                 using (_notification.PushTaskItem("Loading CCT data..."))
                 {
@@ -575,7 +580,7 @@ namespace Tango.MachineStudio.RML.ViewModels
 
         private async Task OnSelectedGBDChanged()
         {
-            if (SelectedGBD != null && !SelectedGBD.IsNew)
+            if (ColorConversionViewVM != null && SelectedGBD != null && !SelectedGBD.IsNew)
             {
                 using (_notification.PushTaskItem("Loading GBD data..."))
                 {
@@ -596,7 +601,7 @@ namespace Tango.MachineStudio.RML.ViewModels
 
         private async Task OnSelectedLUBChanged()
         {
-            if (SelectedLUB != null && !SelectedLUB.IsNew)
+            if (ColorConversionViewVM != null && SelectedLUB != null && !SelectedLUB.IsNew)
             {
                 using (_notification.PushTaskItem("Loading LUB data..."))
                 {