Fixup: Log cleanup

Author: aramg

UI/obs-app.cpp

@@ -1650,9 +1650,8 @@ static uint64_t convert_log_name(bool has_prefix, const char *name)
 static void delete_oldest_file(bool has_prefix, const char *location)
 {
 	BPtr<char> logDir(GetConfigPathPtr(location));
-	string oldestLog;
-	uint64_t oldest_ts = (uint64_t)-1;
 	struct os_dirent *entry;
+	map<int, string> list;
 
 	unsigned int maxLogs = (unsigned int)config_get_uint(
 		App()->GlobalConfig(), "General", "MaxLogs");
@@ -1668,12 +1667,9 @@ static void delete_oldest_file(bool has_prefix, const char *location)
 			uint64_t ts =
 				convert_log_name(has_prefix, entry->d_name);
 
-			if (ts) {
-				if (ts < oldest_ts) {
-					oldestLog = entry->d_name;
-					oldest_ts = ts;
-				}
 
+			if (ts) {
+				list[ts] = entry->d_name;
 				count++;
 			}
 		}
@@ -1682,9 +1678,14 @@ static void delete_oldest_file(bool has_prefix, const char *location)
 
 		if (count > maxLogs) {
 			stringstream delPath;
+			const auto end = list.size() - maxLogs;
+			count = 0;
+			for(auto const & item : list) {
+				if (count++ >= end) break;
 
-			delPath << logDir << "/" << oldestLog;
-			os_unlink(delPath.str().c_str());
+				delPath << logDir << "/" << item.second;
+				os_unlink(delPath.str().c_str());
+			}
 		}
 	}
 }