From 3ccee7ffda32a63c1d8214466a0928a1f2d8d5c5 Mon Sep 17 00:00:00 2001
From: Matthew Chen <charlesmchen@gmail.com>
Date: Fri, 14 Apr 2017 15:58:39 -0400
Subject: [PATCH] =?UTF-8?q?Don=E2=80=99t=20load=20contact=20store=20twice.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

// FREEBIE
---
 Signal/src/contact/OWSContactsManager.m | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Signal/src/contact/OWSContactsManager.m b/Signal/src/contact/OWSContactsManager.m
index a458a20f9..ed8840f07 100644
--- a/Signal/src/contact/OWSContactsManager.m
+++ b/Signal/src/contact/OWSContactsManager.m
@@ -87,7 +87,8 @@ NSString *const OWSContactsManagerSignalRecipientsDidChangeNotification =
 }
 
 - (void)doAfterEnvironmentInitSetup {
-    if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(9, 0)) {
+    if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(9, 0) &&
+        !self.contactStore) {
         OWSAssert(!self.contactStore);
         self.contactStore = [[CNContactStore alloc] init];
         [self.contactStore requestAccessForEntityType:CNEntityTypeContacts