Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
b071046d41
2 changed files with 2 additions and 2 deletions
|
@ -1176,7 +1176,7 @@ bool Options::parsePowVariant(const char *powVariant)
|
|||
break;
|
||||
}
|
||||
|
||||
if (i == ARRAY_SIZE(pow_variant_names) - 1 && (!strcmp(powVariant, "stellitev9") || !strcmp(powVariant, "xtlv2"))) {
|
||||
if (i == ARRAY_SIZE(pow_variant_names) - 1 && (!strcmp(powVariant, "stellitev9") || !strcmp(powVariant, "xtlv2") || !strcmp(powVariant, "half"))) {
|
||||
m_powVariant = POW_XTL_V9;
|
||||
break;
|
||||
}
|
||||
|
|
|
@ -138,7 +138,7 @@ inline PowVariant parseVariant(const std::string variant)
|
|||
powVariant = PowVariant::POW_RTO;
|
||||
} else if (variant == "xfh" || variant == "freehaven" || variant == "faven") {
|
||||
powVariant = PowVariant::POW_XFH;
|
||||
} else if (variant == "xtlv9" || variant == "stellite_v9" || variant == "xtlv2") {
|
||||
} else if (variant == "xtlv9" || variant == "stellite_v9" || variant == "xtlv2" || variant == "half") {
|
||||
powVariant = PowVariant::POW_XTL_V9;
|
||||
} else if (variant == "upx" || variant == "uplexa" || variant == "cn-upx") {
|
||||
powVariant = PowVariant::POW_UPX;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue