From 597f6366ff67da4cf1080c6194be42c9a8f93ad5 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Tue, 19 Mar 2019 14:41:02 -0400
Subject: [PATCH] Fix saving address book properties

---
 NEWS                                     | 1 +
 UI/Contacts/UIxContactFolderProperties.m | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index e43144094..b33a8247a 100644
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,7 @@ Bug fixes
  - [web] lowered size of headings on small screens
  - [web] fixed scrolling in calendars list on Android
  - [web] keep center list of Calendar module visible on small screens
+ - [web] check for duplicate name only if address book name is changed
  - [core] allow super users to modify any event (#4216)
  - [core] correctly handle the full cert chain in S/MIME
  - [core] handle multidays events in freebusy data
diff --git a/UI/Contacts/UIxContactFolderProperties.m b/UI/Contacts/UIxContactFolderProperties.m
index 8d99ea2ca..773aedcac 100644
--- a/UI/Contacts/UIxContactFolderProperties.m
+++ b/UI/Contacts/UIxContactFolderProperties.m
@@ -72,7 +72,7 @@
   NS_DURING
     {
       o = [params objectForKey: @"name"];
-      if ([o isKindOfClass: [NSString class]])
+      if ([o isKindOfClass: [NSString class]] && ![o isEqualToString: [addressbook displayName]])
         [addressbook renameTo: o];
 
       o = [params objectForKey: @"synchronize"];