Merge pull request #5848 from ab9rf/autoclothing-commandparsing

`autoclothing`: correct command line parsing of material specification

Author: ab9rf

docs/changelog.txt

@@ -59,6 +59,7 @@ Template for new versions:
 ## New Features
 
 ## Fixes
+- `autoclothing`: correct defect in validating material specification on command line
 - `autolabor`: Fix running 1 tick less frequently than intended.
 - `buildingplan`: fixed non-clickable pressure plates's triggers (issue #5736)
 - `getplants`: added protective code to avoid misoperation when a plant has an invalid material (which should never happen, but...)

plugins/autoclothing.cpp

@@ -145,19 +145,22 @@ struct ClothingRequirement {
             return std::nullopt;
         }
 
-        if (auto req = setItem(parameters[idx+1]); !req)
+        auto req = setItem(parameters[idx + 1]);
+
+        if (!req)
         {
             out << "Unrecognized item name or token: " << parameters[idx+1] << endl;
             return std::nullopt;
         }
 
-        else if (!validateMaterialCategory(*req)) {
+        req->material_category = material_category;
+
+        if (!validateMaterialCategory(*req)) {
             out << parameters[idx] << " is not a valid material category for " << parameters[idx+1] << endl;
             return std::nullopt;
         }
         else
         {
-            req->material_category = material_category;
             return req;
         }
     }