Implemented FSE "Application Restart" on remote desktop.

Fixed issue with insufficient liquid quantities dialog on MS.
Added "Display Name" to MS RMLs list.
Implemented sorting to all rmls lists on PPC.
Implemented "Display Name" on all PPC rmls lists.

1 files changed, 2 insertions, 2 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 2a1bc1bbb..13cac9c88 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
@@ -285,7 +285,7 @@ namespace Tango.MachineStudio.RML.ViewModels
 
             using (ObservablesContext db = ObservablesContext.CreateDefault())
             {
-                var rmls = await db.Rmls.Where(x => x.Name.ToLower().Contains(filter))
+                var rmls = await db.Rmls.Where(x => x.Name.ToLower().Contains(filter) || x.DisplayName.ToLower().Contains(filter))
                     .Include(x => x.Cct.FileName)
                     .Include(x => x.LiquidTypesRmls.Select(y => y.LiquidType))
                     .Include(x => x.BtsrApplicationType.Name)
@@ -319,7 +319,7 @@ namespace Tango.MachineStudio.RML.ViewModels
                     model.UseGradients = rml.UseColorLibGradients;
                     model.UseLightInks = rml.UseLightInks;
                     model.HeadType = (HeadTypes)rml.HeadType;
-                    model.Btsr = rml.BtsrApplicationType + ", " + rml.BtsrYarnType;
+                    model.Btsr = (String.IsNullOrEmpty(rml.BtsrApplicationType) ? "N/A" : rml.BtsrApplicationType) + ", " + (String.IsNullOrEmpty(rml.BtsrYarnType) ? "N/A" : rml.BtsrYarnType);
                     model.LiquidTypes = rml.LiquidTypes.OrderBy(x => x.Code).Select(x => x.Color).ToList();
 
                     models.Add(model);