From 2a805a76fb34f2623d49c5e3bd3488264ed2500b Mon Sep 17 00:00:00 2001
From: Roy-043 <70520633+Roy-043@users.noreply.github.com>
Date: Fri, 19 Sep 2025 18:23:32 +0200
Subject: [PATCH] BIM: Arch_MergeWalls: issue message when walls are not the
 same

Fixes #21228.
---
 src/Mod/BIM/bimcommands/BimArchUtils.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/Mod/BIM/bimcommands/BimArchUtils.py b/src/Mod/BIM/bimcommands/BimArchUtils.py
index 80d9b69632..5bf0e416e6 100644
--- a/src/Mod/BIM/bimcommands/BimArchUtils.py
+++ b/src/Mod/BIM/bimcommands/BimArchUtils.py
@@ -455,6 +455,7 @@ class Arch_MergeWalls:
         """
 
         import Draft
+        import ArchWall
         walls = FreeCADGui.Selection.getSelection()
         if len(walls) == 1:
             if Draft.getType(walls[0]) == "Wall":
@@ -480,6 +481,11 @@ class Arch_MergeWalls:
             if Draft.getType(w) != "Wall":
                 FreeCAD.Console.PrintMessage(translate("Arch","Select only wall objects"))
                 return
+        if not ArchWall.areSameWallTypes(walls):
+            FreeCAD.Console.PrintMessage(
+                translate("Arch","Walls with different 'Width', 'Height' and 'Align' properties cannot be merged")
+            )
+            return
         FreeCAD.ActiveDocument.openTransaction(translate("Arch","Merge Walls"))
         FreeCADGui.addModule("Arch")
         FreeCADGui.doCommand("Arch.joinWalls(FreeCADGui.Selection.getSelection(),delete=True)")