Browse Source

Cleanup file compare statement

Alex Voinea 5 years ago
parent
commit
f5bdbcc0bd
1 changed files with 2 additions and 2 deletions
  1. 2 2
      Firmware/cardreader.cpp

+ 2 - 2
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];