Using LINQ to SQL Async methods in JobView.

1 files changed, 13 insertions, 24 deletions

diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs
index bb8e31723..a22e1fdf4 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs
@@ -407,33 +407,22 @@ namespace Tango.PPC.Jobs.ViewModels
         /// <param name="message">The message.</param>
         private async void HandleJobSelectedMessage(JobSelectedMessage message)
         {
-            await Task.Factory.StartNew(() =>
+            if (_db != null)
             {
-                if (_db != null)
-                {
-                    _db.Dispose();
-                }
-
-                _db = ObservablesContext.CreateDefault();
-                Job = _db.Jobs.SingleOrDefault(x => x.Guid == message.Job.Guid);
-                var machine = Job.Machine;
-
-                while (machine == null)
-                {
-                    Thread.Sleep(10);
-                    UIHelper.DoEvents();
-                }
+                _db.Dispose();
+            }
 
-                Rmls = _db.Rmls.ToList();
-                ColorSpaces = _db.ColorSpaces.ToList();
-                SpoolTypes = _db.SpoolTypes.ToList();
-                Customers = _db.Customers.Where(x => x.OrganizationGuid == machine.OrganizationGuid).ToList();
+            _db = ObservablesContext.CreateDefault();
+            Job = await _db.Jobs.SingleOrDefaultAsync(x => x.Guid == message.Job.Guid);
+            Rmls = await _db.Rmls.ToListAsync();
+            ColorSpaces = await _db.ColorSpaces.ToListAsync();
+            SpoolTypes = await _db.SpoolTypes.ToListAsync();
+            Customers = await _db.Customers.Where(x => x.OrganizationGuid == ApplicationManager.Machine.OrganizationGuid).ToListAsync();
 
-                if (!_check_gamut_thread.IsAlive)
-                {
-                    _check_gamut_thread.Start();
-                }
-            });
+            if (!_check_gamut_thread.IsAlive)
+            {
+                _check_gamut_thread.Start();
+            }
 
             SegmentsCollectionView = CollectionViewSource.GetDefaultView(Job.Segments);
             SegmentsCollectionView.SortDescriptions.Add(new SortDescription(nameof(Segment.SegmentIndex), ListSortDirection.Ascending));