Improved ShortcutDialog update 5

Author: wise0704

FlashDevelop/Dialogs/ShortcutDialog.cs

@@ -455,10 +455,8 @@ void GetConflictItems(ShortcutListItem target)
                 if (item == target) continue;
                 if (item.Custom == keys)
                 {
-                    if (item.HasConflicts) conflicts.AddRange(item.Conflicts);
-                    else conflicts.Add(item);
-
-                    item.Conflicts = conflicts;
+                    conflicts.Add(item);
+                    item.Conflicts = conflicts; 
                 }
             }
 
@@ -637,6 +635,7 @@ public List<ShortcutListItem> Conflicts
                 get { return this.conflicts; }
                 set
                 {
+                    if (this.conflicts == value) return;
                     this.conflicts = value;
                     UpdateItemHighlightFont(this);
                 }
@@ -666,6 +665,7 @@ public Keys Custom
                 get { return this.custom; }
                 set
                 {
+                    if (this.custom == value) return;
                     this.custom = value;
                     this.KeysString = DataConverter.KeysToString(this.custom);
                     this.SubItems[1].Text = this.KeysString;