#408

iOSClient/Main/CCMain.m

@@ -3150,8 +3150,10 @@
     else { titoloNuovo = NSLocalizedString(@"_directory_on_top_no_", nil); }
     
     app.directoryOnTopItem = [[REMenuItem alloc] initWithTitle:titoloNuovo subtitle:@"" image:[CCGraphics changeThemingColorImage:[UIImage imageNamed:@"menuDirectoryOnTop"] color:[NCBrandColor sharedInstance].brand] highlightedImage:nil action:^(REMenuItem *item) {
-            if ([CCUtility getDirectoryOnTop]) [self directoryOnTop:NO];
-            else [self directoryOnTop:YES];
+            if ([CCUtility getDirectoryOnTop])
+                [self directoryOnTop:NO];
+            else
+                [self directoryOnTop:YES];
     }];
     
 

iOSClient/Main/CCSection.m

@@ -88,7 +88,7 @@
             
         } else {
             
-            if ([metadata.typeFile isEqualToString: k_metadataTypeFile_directory] && directoryOnTop) {
+            if (metadata.directory && directoryOnTop) {
                 [copyRecords insertObject:metadata atIndex:numDirectory++];
             } else {
                 [copyRecords addObject:metadata];

iOSClient/Utility/CCUtility.m

@@ -973,6 +973,10 @@
         metadata.typeFile = k_metadataTypeFile_unknown;
         metadata.iconName = @"file";
         
+    } else if (metadata.directory) {
+        
+        metadata.typeFile = k_metadataTypeFile_directory;
+        
     } else {
         
         CFStringRef fileExtension = (__bridge CFStringRef)[fileName pathExtension];