1 files changed, 24 insertions, 1 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
index a32fa58df..073f79a97 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
@@ -233,7 +233,22 @@ namespace Tango.MachineStudio.Developer.ViewModels
         public List<LiquidTypesRml> LiquidTypesRmls
         {
             get { return _liquidTypesRmls; }
-            set { _liquidTypesRmls = value; RaisePropertyChangedAuto(); }
+            set { _liquidTypesRmls = value; RaisePropertyChangedAuto(); RaisePropertyChanged(nameof(LiquidTypesRmlsOrdered)); }
+        }
+
+        public List<LiquidTypesRml> LiquidTypesRmlsOrdered
+        {
+            get
+            {
+                if (Settings.UsePreferredLiquidVolumeIndex)
+                {
+                    return LiquidTypesRmls.OrderBy(x => x.LiquidType.PreferredIndex).ToList();
+                }
+                else
+                {
+                    return LiquidTypesRmls;
+                }
+            }
         }
 
         private ProcessParametersTablesGroup _rmlProcessParametersTablesGroup;
@@ -841,6 +856,14 @@ namespace Tango.MachineStudio.Developer.ViewModels
         {
             Settings = SettingsManager.Default.GetOrCreate<DeveloperModuleSettings>();
 
+            Settings.PropertyChanged += (x, e) => 
+            {
+                if (e.PropertyName == nameof(Settings.UsePreferredLiquidVolumeIndex))
+                {
+                    RaisePropertyChanged(nameof(LiquidTypesRmlsOrdered));
+                }
+            };
+
             AutoProcessSelection = Settings.AutoProcessSelection;
 
             SelectedJobs = new ObservableCollection<Job>();