From 091bf2fdf052e982c83a5f8c71b616519d1d04b8 Mon Sep 17 00:00:00 2001 From: Kilrah Date: Sun, 17 Jun 2018 22:07:33 +0200 Subject: [PATCH] Hide hidden files --- radio/src/gui/480x272/radio_sdmanager.cpp | 5 +++-- radio/src/gui/common/stdlcd/radio_sdmanager.cpp | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/radio/src/gui/480x272/radio_sdmanager.cpp b/radio/src/gui/480x272/radio_sdmanager.cpp index 6a851d9c9..a652cb206 100644 --- a/radio/src/gui/480x272/radio_sdmanager.cpp +++ b/radio/src/gui/480x272/radio_sdmanager.cpp @@ -294,9 +294,10 @@ bool menuRadioSdManager(event_t _event) bool firstTime = true; for (;;) { res = sdReadDir(&dir, &fno, firstTime); - if (res != FR_OK || fno.fname[0] == 0) break; /* Break on error or end of dir */ + if (res != FR_OK || fno.fname[0] == 0) break; /* Break on error or end of dir */ if (strlen(fno.fname) > SD_SCREEN_FILE_LENGTH) continue; - if (fno.fname[0] == '.' && fno.fname[1] != '.') continue; /* Ignore hidden files under UNIX, but not .. */ + if (fno.fattrib & AM_HID) continue; /* Ignore Windows hidden files */ + if (fno.fname[0] == '.' && fno.fname[1] != '.') continue; /* Ignore UNIX hidden files, but not .. */ reusableBuffer.sdmanager.count++; diff --git a/radio/src/gui/common/stdlcd/radio_sdmanager.cpp b/radio/src/gui/common/stdlcd/radio_sdmanager.cpp index c2f7aac57..79f5f2f3a 100644 --- a/radio/src/gui/common/stdlcd/radio_sdmanager.cpp +++ b/radio/src/gui/common/stdlcd/radio_sdmanager.cpp @@ -341,9 +341,10 @@ void menuRadioSdManager(event_t _event) bool firstTime = true; for (;;) { res = sdReadDir(&dir, &fno, firstTime); - if (res != FR_OK || fno.fname[0] == 0) break; /* Break on error or end of dir */ + if (res != FR_OK || fno.fname[0] == 0) break; /* Break on error or end of dir */ if (strlen(fno.fname) > SD_SCREEN_FILE_LENGTH) continue; - if (fno.fname[0] == '.' && fno.fname[1] != '.') continue; /* Ignore hidden files under UNIX, but not .. */ + if (fno.fattrib & AM_HID) continue; /* Ignore Windows hidden files */ + if (fno.fname[0] == '.' && fno.fname[1] != '.') continue; /* Ignore UNIX hidden files, but not .. */ reusableBuffer.sdmanager.count++;