Merge remote-tracking branch 'upstream/master'

Author: LeonLeeX

src/config/proxygroup.h

@@ -3,7 +3,7 @@
 
 #include "def.h"
 
-enum ProxyGroupType
+enum class ProxyGroupType
 {
     Select,
     URLTest,
@@ -13,7 +13,7 @@ enum ProxyGroupType
     SSID
 };
 
-enum BalanceStrategy
+enum class BalanceStrategy
 {
     ConsistentHashing,
     RoundRobin

src/config/ruleset.h

@@ -3,7 +3,7 @@
 
 #include "def.h"
 
-enum RulesetType
+enum class RulesetType
 {
     SurgeRuleset,
     QuantumultX,

src/generator/config/subexport.cpp

@@ -1559,7 +1559,7 @@ void proxyToQuanX(std::vector<Proxy> &nodes, INIReader &ini, std::vector<Ruleset
         std::string proxies = join(filtered_nodelist, ", ");
 
         std::string singlegroup = type + "=" + x.Name + ", " + proxies;
-        if(type != "static")
+        if(x.Type != ProxyGroupType::Select && x.Type != ProxyGroupType::SSID)
         {
             singlegroup += ", check-interval=" + std::to_string(x.Interval);
             if(x.Tolerance > 0)