Browse Source

Skip redundant file/dir tests

Scott Lahteine 5 years ago
parent
commit
d34c22ac22
1 changed files with 6 additions and 5 deletions
  1. 6
    5
      Marlin/src/sd/cardreader.cpp

+ 6
- 5
Marlin/src/sd/cardreader.cpp View File

@@ -154,12 +154,13 @@ char *createFilename(char * const buffer, const dir_t &p) {
154 154
 // Return 'true' if the item is a folder or G-code file
155 155
 //
156 156
 bool CardReader::is_dir_or_gcode(const dir_t &p) {
157
-  uint8_t pn0 = p.name[0];
157
+  //uint8_t pn0 = p.name[0];
158 158
 
159
-  if ( pn0 == DIR_NAME_FREE || pn0 == DIR_NAME_DELETED  // Clear or Deleted entry
160
-    || pn0 == '.' || longFilename[0] == '.'             // Hidden file
161
-    || !DIR_IS_FILE_OR_SUBDIR(&p)                       // Not a File or Directory
162
-    || (p.attributes & DIR_ATT_HIDDEN)                  // Hidden by attribute
159
+  if ( (p.attributes & DIR_ATT_HIDDEN)                  // Hidden by attribute
160
+    // When readDir() > 0 these must be false:
161
+    //|| pn0 == DIR_NAME_FREE || pn0 == DIR_NAME_DELETED  // Clear or Deleted entry
162
+    //|| pn0 == '.' || longFilename[0] == '.'             // Hidden file
163
+    //|| !DIR_IS_FILE_OR_SUBDIR(&p)                       // Not a File or Directory
163 164
   ) return false;
164 165
 
165 166
   flag.filenameIsDir = DIR_IS_SUBDIR(&p);               // We know it's a File or Folder

Loading…
Cancel
Save