From f5bdbcc0bd91679ec5964bac162c949b28a2c28f Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Tue, 26 Nov 2019 14:10:44 +0200 Subject: [PATCH] Cleanup file compare statement --- Firmware/cardreader.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/cardreader.cpp b/Firmware/cardreader.cpp index 9f97c800e..26e63b879 100644 --- a/Firmware/cardreader.cpp +++ b/Firmware/cardreader.cpp @@ -868,9 +868,9 @@ void CardReader::presort() { getfilename_simple(positions[sort_order[j - gap]]); char *name2 = LONGEST_FILENAME; // use the string in-place #if HAS_FOLDER_SORTING - for (; j >= gap && ((sdSort == SD_SORT_TIME && _SORT_CMP_TIME_DIR(FOLDER_SORTING)) || (sdSort == SD_SORT_ALPHA && _SORT_CMP_DIR(FOLDER_SORTING)));) + for (; j >= gap && ((sdSort == SD_SORT_TIME)?(_SORT_CMP_TIME_DIR(FOLDER_SORTING)):(_SORT_CMP_DIR(FOLDER_SORTING)));) #else - for (; j >= gap && ((sdSort == SD_SORT_TIME && _SORT_CMP_TIME_NODIR()) || (sdSort == SD_SORT_ALPHA && _SORT_CMP_NODIR()));) + for (; j >= gap && ((sdSort == SD_SORT_TIME)?(_SORT_CMP_TIME_NODIR()):(_SORT_CMP_NODIR()));) #endif { sort_order[j] = sort_order[j - gap];