Fix after generating a Clash Proxy Provider, the cached Clash base will be broken

This commit is contained in:
Tindy X committed 2020-02-06 16:44:12 +08:00
1 parent cb3ad69803
commit 5b5ae714f7
3 files changed
+4 -3

No files matched your search

+2 -1
View File
@@ -295,7 +295,8 @@ void readConf()
}
ini.EnterSection("ruleset");
if(ini.GetBool("enabled"))
enable_rule_generator = ini.GetBool("enabled");
if(enable_rule_generator)
{
if(ini.ItemExist("overwrite_original_rules"))
overwrite_original_rules = ini.GetBool("overwrite_original_rules");
+1 -1
View File
@@ -675,7 +675,7 @@ void netchToClash(std::vector<nodeInfo> &nodes, YAML::Node &yamlnode, string_arr
{
YAML::Node provider;
provider["proxies"] = proxies;
yamlnode = provider;
yamlnode.reset(provider);
return;
}
+1 -1
View File
@@ -31,7 +31,7 @@ struct extra_settings
void rulesetToClash(YAML::Node &base_rule, std::vector<ruleset_content> &ruleset_content_array, bool overwrite_original_rules);
void rulesetToSurge(INIReader &base_rule, std::vector<ruleset_content> &ruleset_content_array, int surge_ver, bool overwrite_original_rules);
std::string netchToClash(std::vector<nodeInfo> &nodes, std::string &base_conf, std::vector<ruleset_content> &ruleset_content_array, string_array &extra_proxy_group, bool clashR, extra_settings &ext);
void netchToClash(std::vector<nodeInfo> &nodes, YAML::Node &base, string_array &extra_proxy_group, bool clashR, extra_settings &ext);
void netchToClash(std::vector<nodeInfo> &nodes, YAML::Node &yamlnode, string_array &extra_proxy_group, bool clashR, extra_settings &ext);
std::string netchToSurge(std::vector<nodeInfo> &nodes, std::string &base_conf, std::vector<ruleset_content> &ruleset_content_array, string_array &extra_proxy_group, int surge_ver, extra_settings &ext);
std::string netchToMellow(std::vector<nodeInfo> &nodes, std::string &base_conf, std::vector<ruleset_content> &ruleset_content_array, string_array &extra_proxy_group, extra_settings &ext);
void netchToMellow(std::vector<nodeInfo> &nodes, INIReader &ini, std::vector<ruleset_content> &ruleset_content_array, string_array &extra_proxy_group, extra_settings &ext);