From 03719f58df35526c8440bc13f427c2bc4bfd7b7e Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sun, 24 Jan 2021 08:52:34 -0800
Subject: [PATCH] avoid infinite parentage when linking rooms

---
 docs/changelog.txt            | 1 +
 library/modules/Buildings.cpp | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index 758a54fb5..735c0716e 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -36,6 +36,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 ## Fixes
 - `embark-assistant`: fixed order of factors when calculating min temperature
 - `embark-assistant`: improved performance of surveying
+- `quickfort`: creating zones no longer causes eventual crashes
 
 ## Misc Improvements
 - `buildingplan`: set global settings from the ``DFHack#`` prompt: e.g.  ``buildingplan set boulders false``
diff --git a/library/modules/Buildings.cpp b/library/modules/Buildings.cpp
index 5a0cd37dc..bd8dcb9de 100644
--- a/library/modules/Buildings.cpp
+++ b/library/modules/Buildings.cpp
@@ -885,7 +885,7 @@ static void linkRooms(df::building *bld)
             continue;
 
         df::building_extents_type *pext = getExtentTile(room->room, df::coord2d(bld->x1, bld->y1));
-        if (!pext || !*pext)
+        if (!pext || !*pext || room == bld)
             continue;
 
         changed = true;