From 199a5f5215350c480cf20de7aac3b9b17dc06a93 Mon Sep 17 00:00:00 2001
From: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Fri, 13 May 2016 11:14:28 -0400
Subject: [PATCH] (fix) don't try to initialize location values when using
 single store mode

---
 SOPE/GDLContentStore/GCSFolderManager.m | 52 ++++++++++++++-----------
 1 file changed, 29 insertions(+), 23 deletions(-)

diff --git a/SOPE/GDLContentStore/GCSFolderManager.m b/SOPE/GDLContentStore/GCSFolderManager.m
index 29de16251..37c37231f 100644
--- a/SOPE/GDLContentStore/GCSFolderManager.m
+++ b/SOPE/GDLContentStore/GCSFolderManager.m
@@ -436,32 +436,38 @@ static BOOL       _singleStoreMode           = NO;
   folderId   = [_record objectForKey:@"c_folder_id"];
   folderName = [_record objectForKey:@"c_path"];
   path       = [self pathFromInternalName:folderName];
-  
-  locationString = [_record objectForKey:@"c_location"];
-  location = [locationString isNotNull] 
-    ? [NSURL URLWithString:locationString]
-    : nil;
-  if (location == nil) {
-    [self logWithFormat:@"ERROR(%s): missing folder location in record: %@", 
-	  __PRETTY_FUNCTION__, _record];
-    return nil;
-  }
-  
-  locationString = [_record objectForKey:@"c_quick_location"];
-  quickLocation = [locationString isNotNull] 
-    ? [NSURL URLWithString:locationString]
-    : nil;
 
-  if (quickLocation == nil) {
-    [self logWithFormat:@"WARNING(%s): missing quick location in record: %@", 
-	  __PRETTY_FUNCTION__, _record];
+  if (!_singleStoreMode) {
+    locationString = [_record objectForKey:@"c_location"];
+    location = [locationString isNotNull] 
+      ? [NSURL URLWithString:locationString]
+      : nil;
+    if (location == nil) {
+      [self logWithFormat:@"ERROR(%s): missing folder location in record: %@",
+            __PRETTY_FUNCTION__, _record];
+      return nil;
+    }
+
+    locationString = [_record objectForKey:@"c_quick_location"];
+    quickLocation = [locationString isNotNull] 
+      ? [NSURL URLWithString:locationString]
+      : nil;
+
+    if (quickLocation == nil) {
+      [self logWithFormat:@"WARNING(%s): missing quick location in record: %@",
+            __PRETTY_FUNCTION__, _record];
+    }
+
+    locationString = [_record objectForKey:@"c_acl_location"];
+    acl_location = [locationString isNotNull]
+      ? [NSURL URLWithString:locationString]
+      : nil;
+  } else {
+    location = nil;
+    quickLocation = nil;
+    acl_location = nil;
   }
 
-  locationString = [_record objectForKey:@"c_acl_location"];
-  acl_location = [locationString isNotNull]
-    ? [NSURL URLWithString:locationString]
-    : nil;
-  
   folder = [[GCSFolder alloc] initWithPath:path primaryKey:folderId
 			      folderTypeName:folderTypeName 
 			      folderType:folderType