From ceaa518be9d7235bc56706b4c29bb77f149f9bc3 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Fri, 11 May 2018 10:04:10 -0400
Subject: [PATCH] Fix a potential segfault in getAnyUnit

See #1218
---
 library/modules/Gui.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/library/modules/Gui.cpp b/library/modules/Gui.cpp
index ee604fb22..fe8333c41 100644
--- a/library/modules/Gui.cpp
+++ b/library/modules/Gui.cpp
@@ -1032,10 +1032,10 @@ df::unit *Gui::getAnyUnit(df::viewscreen *top)
     case ZonesPitInfo: // (i) zone -> (P)it
     case ZonesPenInfo: // (i) zone -> pe(N)
     {
-        if (ui_building_assign_units || ui_building_item_cursor)
-            return vector_get(*ui_building_assign_units, *ui_building_item_cursor);
+        if (!ui_building_assign_units || !ui_building_item_cursor)
+            return NULL;
 
-        return NULL;
+        return vector_get(*ui_building_assign_units, *ui_building_item_cursor);
     }
     case Burrows:
     {