From e21f511ddb26ac5e021741d739f633eb44fd4387 Mon Sep 17 00:00:00 2001 From: Tindy X <49061470+tindy2013@users.noreply.github.com> Date: Fri, 11 Jun 2021 21:38:15 +0800 Subject: [PATCH] Bugs fix Fix subscription info not being passed to the response. Use stable sort for sorting nodes. --- src/generator/config/nodemanip.cpp | 2 +- src/generator/config/subexport.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/generator/config/nodemanip.cpp b/src/generator/config/nodemanip.cpp index b3f32af..b5fb84c 100644 --- a/src/generator/config/nodemanip.cpp +++ b/src/generator/config/nodemanip.cpp @@ -34,7 +34,7 @@ void copyNodes(std::vector &source, std::vector &dest) int addNodes(std::string link, std::vector &allNodes, int groupID, parse_settings &parse_set) { - std::string &proxy = *parse_set.proxy, subInfo = *parse_set.sub_info; + std::string &proxy = *parse_set.proxy, &subInfo = *parse_set.sub_info; string_array &exclude_remarks = *parse_set.exclude_remarks; string_array &include_remarks = *parse_set.include_remarks; string_array &stream_rules = *parse_set.stream_rules; diff --git a/src/generator/config/subexport.cpp b/src/generator/config/subexport.cpp index c7d3e08..cb94d8d 100644 --- a/src/generator/config/subexport.cpp +++ b/src/generator/config/subexport.cpp @@ -273,7 +273,7 @@ void preprocessNodes(std::vector &nodes, extra_settings &ext) return 0; return compare(a, b); }; - std::sort(nodes.begin(), nodes.end(), comparer); + std::stable_sort(nodes.begin(), nodes.end(), comparer); failed = false; }, gScriptCleanContext); }