From 90f449953eb94933987d4fff27836865046a26f4 Mon Sep 17 00:00:00 2001
From: Tindy X <49061470+tindy2013@users.noreply.github.com>
Date: Wed, 11 Dec 2019 13:27:04 +0800
Subject: [PATCH] Add missing sort flag controller

---
 subexport.cpp | 81 ++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 54 insertions(+), 27 deletions(-)

diff --git a/subexport.cpp b/subexport.cpp
index 68b8d9b..93e4bda 100644
--- a/subexport.cpp
+++ b/subexport.cpp
@@ -414,10 +414,13 @@ std::string netchToClash(std::vector<nodeInfo> &nodes, std::string &base_conf, s
             x.remarks = addEmoji(x.remarks);
     });
 
-    std::sort(nodes.begin(), nodes.end(), [](const nodeInfo &a, const nodeInfo &b)
+    if(ext.sort_flag)
     {
-        return a.remarks < b.remarks;
-    });
+        std::sort(nodes.begin(), nodes.end(), [](const nodeInfo &a, const nodeInfo &b)
+        {
+            return a.remarks < b.remarks;
+        });
+    }
 
     for(nodeInfo &x : nodes)
     {
@@ -636,10 +639,13 @@ std::string netchToSurge(std::vector<nodeInfo> &nodes, std::string &base_conf, s
             x.remarks = addEmoji(x.remarks);
     });
 
-    std::sort(nodes.begin(), nodes.end(), [](const nodeInfo &a, const nodeInfo &b)
+    if(ext.sort_flag)
     {
-        return a.remarks < b.remarks;
-    });
+        std::sort(nodes.begin(), nodes.end(), [](const nodeInfo &a, const nodeInfo &b)
+        {
+            return a.remarks < b.remarks;
+        });
+    }
 
     for(nodeInfo &x : nodes)
     {
@@ -851,10 +857,13 @@ std::string netchToSS(std::vector<nodeInfo> &nodes, extra_settings &ext)
             x.remarks = addEmoji(x.remarks);
     });
 
-    std::sort(nodes.begin(), nodes.end(), [](const nodeInfo &a, const nodeInfo &b)
+    if(ext.sort_flag)
     {
-        return a.remarks < b.remarks;
-    });
+        std::sort(nodes.begin(), nodes.end(), [](const nodeInfo &a, const nodeInfo &b)
+        {
+            return a.remarks < b.remarks;
+        });
+    }
 
     for(nodeInfo &x : nodes)
     {
@@ -912,10 +921,13 @@ std::string netchToSSR(std::vector<nodeInfo> &nodes, extra_settings &ext)
             x.remarks = addEmoji(x.remarks);
     });
 
-    std::sort(nodes.begin(), nodes.end(), [](const nodeInfo &a, const nodeInfo &b)
+    if(ext.sort_flag)
     {
-        return a.remarks < b.remarks;
-    });
+        std::sort(nodes.begin(), nodes.end(), [](const nodeInfo &a, const nodeInfo &b)
+        {
+            return a.remarks < b.remarks;
+        });
+    }
 
     for(nodeInfo &x : nodes)
     {
@@ -970,10 +982,13 @@ std::string netchToVMess(std::vector<nodeInfo> &nodes, extra_settings &ext)
             x.remarks = addEmoji(x.remarks);
     });
 
-    std::sort(nodes.begin(), nodes.end(), [](const nodeInfo &a, const nodeInfo &b)
+    if(ext.sort_flag)
     {
-        return a.remarks < b.remarks;
-    });
+        std::sort(nodes.begin(), nodes.end(), [](const nodeInfo &a, const nodeInfo &b)
+        {
+            return a.remarks < b.remarks;
+        });
+    }
 
     for(nodeInfo &x : nodes)
     {
@@ -1026,10 +1041,13 @@ std::string netchToQuan(std::vector<nodeInfo> &nodes, extra_settings &ext)
             x.remarks = addEmoji(x.remarks);
     });
 
-    std::sort(nodes.begin(), nodes.end(), [](const nodeInfo &a, const nodeInfo &b)
+    if(ext.sort_flag)
     {
-        return a.remarks < b.remarks;
-    });
+        std::sort(nodes.begin(), nodes.end(), [](const nodeInfo &a, const nodeInfo &b)
+        {
+            return a.remarks < b.remarks;
+        });
+    }
 
     for(nodeInfo &x : nodes)
     {
@@ -1114,10 +1132,13 @@ std::string netchToQuanX(std::vector<nodeInfo> &nodes, extra_settings &ext)
             x.remarks = addEmoji(x.remarks);
     });
 
-    std::sort(nodes.begin(), nodes.end(), [](const nodeInfo &a, const nodeInfo &b)
+    if(ext.sort_flag)
     {
-        return a.remarks < b.remarks;
-    });
+        std::sort(nodes.begin(), nodes.end(), [](const nodeInfo &a, const nodeInfo &b)
+        {
+            return a.remarks < b.remarks;
+        });
+    }
 
     for(nodeInfo &x : nodes)
     {
@@ -1214,10 +1235,13 @@ std::string netchToSSD(std::vector<nodeInfo> &nodes, std::string &group, extra_s
             x.remarks = addEmoji(x.remarks);
     });
 
-    std::sort(nodes.begin(), nodes.end(), [](const nodeInfo &a, const nodeInfo &b)
+    if(ext.sort_flag)
     {
-        return a.remarks < b.remarks;
-    });
+        std::sort(nodes.begin(), nodes.end(), [](const nodeInfo &a, const nodeInfo &b)
+        {
+            return a.remarks < b.remarks;
+        });
+    }
 
     for(nodeInfo &x : nodes)
     {
@@ -1318,10 +1342,13 @@ std::string netchToMellow(std::vector<nodeInfo> &nodes, std::string &base_conf,
             x.remarks = addEmoji(x.remarks);
     });
 
-    std::sort(nodes.begin(), nodes.end(), [](const nodeInfo &a, const nodeInfo &b)
+    if(ext.sort_flag)
     {
-        return a.remarks < b.remarks;
-    });
+        std::sort(nodes.begin(), nodes.end(), [](const nodeInfo &a, const nodeInfo &b)
+        {
+            return a.remarks < b.remarks;
+        });
+    }
 
     for(nodeInfo &x : nodes)
     {