From 4d700aee6a9bc51fb0f5c1d92123975ee25645d1 Mon Sep 17 00:00:00 2001 From: dec05eba Date: Sat, 11 Jul 2020 08:37:39 +0200 Subject: Fix watch history being broken --- src/QuickMedia.cpp | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/QuickMedia.cpp b/src/QuickMedia.cpp index 32913a3..18dd114 100644 --- a/src/QuickMedia.cpp +++ b/src/QuickMedia.cpp @@ -367,15 +367,9 @@ namespace QuickMedia { static void fill_history_items_from_json(const Json::Value &history_json, BodyItems &history_items) { assert(history_json.isArray()); - if(history_json.empty()) - return; + BodyItems body_items; - auto begin = history_json.begin(); - --begin; - auto end = history_json.end(); - while(end != begin) { - --end; - const Json::Value &item = *end; + for(const Json::Value &item : history_json) { if(!item.isObject()) continue; @@ -396,7 +390,11 @@ namespace QuickMedia { auto body_item = std::make_unique(std::move(title_str)); body_item->url = "https://youtube.com/watch?v=" + video_id_str; body_item->thumbnail_url = "https://img.youtube.com/vi/" + video_id_str + "/hqdefault.jpg"; - history_items.push_back(std::move(body_item)); + body_items.push_back(std::move(body_item)); + } + + for(auto it = body_items.rbegin(), end = body_items.rend(); it != end; ++it) { + history_items.push_back(std::move(*it)); } } -- cgit v1.2.3