Merge branch 'software' of https://twinetfs.visualstudio.com/Tango/_git/Tango into software

1 files changed, 3 insertions, 3 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/MainViewVM.cs
index 686d95ccc..321d4af04 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/MainViewVM.cs
@@ -237,7 +237,7 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels
             set { _RMLFilter = value; RaisePropertyChangedAuto(); OnFilterChanged(); }
         }
 
-        private async void OnFilterChanged()
+        public async void OnFilterChanged()
         {
             await LoadRmlExtentions();
         }
@@ -940,7 +940,7 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels
                             _allUsers.Add(model);
                         }
                     }
-                        
+                    
                     var q = (from c in db.Rmls.Where(x => x.Name.ToLower().Contains(filter))
                              join p in db.RmlsExtensions on c.Guid equals p.RmlsGuid into ps
                              from p in ps.DefaultIfEmpty()
@@ -953,7 +953,7 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels
                                  Manufacturer = x.RML.Manufacturer,
                                  Brand = x.RMLExtesion == null ? "" : (Brands.Where(y => y.Guid == x.RMLExtesion.YarnBrandGuid).Select(z => z.Name).FirstOrDefault()),
                                  LinearDensity = (int)x.RML.FiberSize,
-                                 CreatedBy = x.RMLExtesion == null ? "" : _allUsers.SingleOrDefault(y => y.Guid == x.RMLExtesion.UsersGuid).Name,
+                                 CreatedBy = (x.RMLExtesion == null || x.RMLExtesion.UsersGuid == null || null == _allUsers.SingleOrDefault(y => y.Guid == x.RMLExtesion.UsersGuid)) ? "" : _allUsers.SingleOrDefault(y => y.Guid == x.RMLExtesion.UsersGuid).Name,
                                  Created = x.RMLExtesion == null ? DateTime.Now : x.RMLExtesion.Created,
                                  LastUpdated = x.RMLExtesion == null ? DateTime.Now : x.RMLExtesion.LastUpdated,
                                  Status = x.RMLExtesion == null ? RMLExtensionStatus.New : x.RMLExtesion.RMLStatus,