Fix regression when saving mail folders state

Alinto · Nov 16, 2015 · a9984d9 · a9984d9
1 parent 2a90102
commit a9984d9
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/UI/MailerUI/UIxMailMainFrame.m b/UI/MailerUI/UIxMailMainFrame.m
@@ -403,16 +403,18 @@ - (WOResponse *) saveDragHandleStateAction
 - (WOResponse *) saveFoldersStateAction
 {
   WORequest *request;
-  NSString *expandedFolders;
+  NSArray *expandedFolders;
+  NSString *json;
 
   [self _setupContext];
   request = [context request];
-  expandedFolders = [request formValueForKey: @"expandedFolders"];
-
-  [moduleSettings setObject: [expandedFolders componentsSeparatedByString: @","]
-		  forKey: @"ExpandedFolders"];
-
-  [us synchronize];
+  json = [request formValueForKey: @"expandedFolders"];
+  if ([json length])
+    {
+      expandedFolders = [json objectFromJSONString];
+      [moduleSettings setObject: expandedFolders forKey: @"ExpandedFolders"];
+      [us synchronize];
+    }
 
   return [self responseWithStatus: 204];
 }