1 files changed, 2 insertions, 8 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/RolesViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/RolesViewVM.cs
index 8ce95f736..50caf4c6d 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/RolesViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/RolesViewVM.cs
@@ -50,16 +50,10 @@ namespace Tango.MachineStudio.DB.ViewModels
         {
             base.OnBeforeEntitySave(mode, role);
 
+            Adapter.Context.RolesPermissions.RemoveRange(role.RolesPermissions);
+
             foreach (var permission in SelectedPermissions)
             {
-                var rolePermission = role.RolesPermissions.SingleOrDefault(x => x.Permission == permission.Entity);
-
-                if (rolePermission != null && !permission.IsSelected)
-                {
-                    rolePermission.Delete();
-                    continue;
-                }
-
                 if (permission.IsSelected)
                 {
                     role.RolesPermissions.Add(new RolesPermission()