From 1857e611d3563acf71fd86d6342aba514344c2a0 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Thu, 18 Dec 2014 07:49:16 -0800 Subject: [PATCH] Other small tweaks --- Marlin/cardreader.cpp | 8 ++++---- Marlin/ultralcd.cpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Marlin/cardreader.cpp b/Marlin/cardreader.cpp index 5aad01942..673e9d55a 100644 --- a/Marlin/cardreader.cpp +++ b/Marlin/cardreader.cpp @@ -91,10 +91,10 @@ void CardReader::lsDive(const char *prepend, SdFile parent, const char * const m { char pn0 = p.name[0]; if (pn0 == DIR_NAME_FREE) break; - if (pn0 == DIR_NAME_DELETED || pn0 == '.'|| pn0 == '_') continue; - if (longFilename[0] != '\0' && - (longFilename[0] == '.' || longFilename[0] == '_')) continue; - + if (pn0 == DIR_NAME_DELETED || pn0 == '.' || pn0 == '_') continue; + char lf0 = longFilename[0]; + if (lf0 == '.' || lf0 == '_') continue; + if (!DIR_IS_FILE_OR_SUBDIR(&p)) continue; filenameIsDir=DIR_IS_SUBDIR(&p); diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp index 93dc95d37..11c7e9e6a 100644 --- a/Marlin/ultralcd.cpp +++ b/Marlin/ultralcd.cpp @@ -261,7 +261,7 @@ static void lcd_status_screen() if (feedmultiply < 10) feedmultiply = 10; - if (feedmultiply > 999) + else if (feedmultiply > 999) feedmultiply = 999; #endif//ULTIPANEL }