Merge pull request #5255 from NicksWorld/fix/changevein_infloop

Disallow changing a vein into itself
DFHack · Feb 7, 2025 · bf15f79 · bf15f79
2 parents 80a13e3 + d6b16e4
commit bf15f79
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/docs/changelog.txt b/docs/changelog.txt
@@ -61,6 +61,7 @@ Template for new versions:
 
 ## Fixes
 - `spectate`: don't allow temporarily modified announcement settings to be written to disk when "auto-unpause" mode is enabled
+- `changevein`: fix a crash that could occur when attempting to change a vein into itself
 
 ## Misc Improvements
 - `spectate`: player-set configuration is now stored globally instead of per-fort

diff --git a/plugins/changevein.cpp b/plugins/changevein.cpp
@@ -254,6 +254,12 @@ command_result df_changevein (color_ostream &out, vector <string> & parameters)
         return CR_FAILURE;
     }
 
+    if (mineral->inorganic_mat == mi.index)
+    {
+        out.printerr("Selected tile is already of the target material.\n");
+        return CR_FAILURE;
+    }
+
     VeinEdgeBitmask mask = VeinEdgeBitmask(mineral);
     mineral->inorganic_mat = mi.index;
     ChangeSameBlockVeins(block, mineral, mask, mi.index);