Users & Roles fix.

Applied missing logs for bug report in MS.
Applied proofing for UsbSerialAdapter connect/disconnect when port is freezing.

1 files changed, 7 insertions, 7 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/ViewModels/MainViewVM.cs
index db312b78f..2234d09c1 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/ViewModels/MainViewVM.cs
@@ -177,7 +177,7 @@ namespace Tango.MachineStudio.UsersAndRoles.ViewModels
                 using (_notification.PushTaskItem("Removing organization..."))
                 {
                     await SelectedOrganization.DeleteCascadeAsync(_organizationsContext);
-                    LoadOrganizations();
+                    await LoadOrganizations();
                 }
             }
         }
@@ -187,7 +187,7 @@ namespace Tango.MachineStudio.UsersAndRoles.ViewModels
             using (_notification.PushTaskItem("Saving organization address and contact..."))
             {
                 await ManagedOrganization.SaveAsync(_manageContext);
-                LoadOrganizations();
+                await LoadOrganizations();
                 SelectedOrganization = Organizations.SingleOrDefault(x => x.Guid == ManagedOrganization.Guid);
             }
         }
@@ -263,9 +263,9 @@ namespace Tango.MachineStudio.UsersAndRoles.ViewModels
             }
         }
 
-        private void LoadOrganizations()
+        private Task LoadOrganizations()
         {
-            Task.Factory.StartNew(() =>
+            return Task.Factory.StartNew(() =>
             {
                 _organizationsContext = ObservablesContext.CreateDefault();
 
@@ -320,6 +320,8 @@ namespace Tango.MachineStudio.UsersAndRoles.ViewModels
                     Email = email,
                 };
 
+                user.Address = new Address();
+
                 user.UsersRoles.Add(new UsersRole()
                 {
                     User = user,
@@ -336,14 +338,12 @@ namespace Tango.MachineStudio.UsersAndRoles.ViewModels
                     return;
                 }
 
-                user.Address = new Address();
-
                 ManagedOrganization.Users.Add(user);
 
                 using (_notification.PushTaskItem("Adding new user..."))
                 {
                     await ManagedOrganization.SaveAsync(_manageContext);
-                    LoadOrganizations();
+                    await LoadOrganizations();
                     SelectedOrganization = Organizations.SingleOrDefault(x => x.Guid == ManagedOrganization.Guid);
                 }
             }