From 1d73560cf83a501bf58a5fa833d44d893f1586d6 Mon Sep 17 00:00:00 2001 From: Steven Smith Date: Wed, 28 Jan 2015 20:12:42 -0800 Subject: [PATCH] Fix UI alphabetization. --- source/common.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/source/common.cpp b/source/common.cpp index beae21e..1d75f05 100644 --- a/source/common.cpp +++ b/source/common.cpp @@ -480,15 +480,12 @@ bool ui_is_directory(const std::string path) { struct ui_alphabetize { inline bool operator() (SelectableElement a, SelectableElement b) { - return a.name.compare(b.name) < 0; + return strcasecmp(a.name.c_str(), b.name.c_str()) < 0; } }; std::vector ui_get_dir_elements(const std::string directory, const std::string extension) { std::vector elements; - elements.push_back({".", "."}); - elements.push_back({"..", ".."}); - DIR *dir = opendir(directory.c_str()); if(dir != NULL) { while(true) { @@ -520,6 +517,8 @@ std::vector ui_get_dir_elements(const std::string directory, } std::sort(elements.begin(), elements.end(), ui_alphabetize()); + elements.insert(elements.begin(), {"..", ".."}); + elements.insert(elements.begin(), {".", "."}); return elements; }