diff --git a/docs/changelog.txt b/docs/changelog.txt index cce97e5d6..82236cf16 100644 --- a/docs/changelog.txt +++ b/docs/changelog.txt @@ -33,6 +33,9 @@ changelog.txt uses a syntax similar to RST, with a few special sequences: # Future +## Fixes +- `tailor`: fixed some inconsistencies (and possible crashes) when parsing certain subcommands, e.g. ``tailor help`` + # 0.47.05-r3 ## New Plugins diff --git a/plugins/tailor.cpp b/plugins/tailor.cpp index a85ab5bed..a48bea2c6 100644 --- a/plugins/tailor.cpp +++ b/plugins/tailor.cpp @@ -571,15 +571,15 @@ DFhackCExport command_result plugin_onupdate(color_ostream& out) static command_result tailor_cmd(color_ostream& out, vector & parameters) { bool desired = enabled; - if (parameters.size() == 1 && parameters[0] == "enable" || parameters[0] == "on" || parameters[0] == "1") + if (parameters.size() == 1 && (parameters[0] == "enable" || parameters[0] == "on" || parameters[0] == "1")) { desired = true; } - else if (parameters.size() == 1 && parameters[0] == "disable" || parameters[0] == "off" || parameters[0] == "0") + else if (parameters.size() == 1 && (parameters[0] == "disable" || parameters[0] == "off" || parameters[0] == "0")) { desired = false; } - else if (parameters.size() == 1 && parameters[0] == "usage" || parameters[0] == "help" || parameters[0] == "?") + else if (parameters.size() == 1 && (parameters[0] == "usage" || parameters[0] == "help" || parameters[0] == "?")) { out.print("%s: %s\nUsage:\n%s", plugin_name, tagline, usage); return CR_OK;