From 9d353c1ea72f43a909613d62ef962544944f9e22 Mon Sep 17 00:00:00 2001 From: lethosor Date: Fri, 11 May 2018 10:21:05 -0400 Subject: [PATCH] tweak block-labors: fix crash if unit is null Fixes #1057 --- plugins/tweak/tweaks/block-labors.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/tweak/tweaks/block-labors.h b/plugins/tweak/tweaks/block-labors.h index d90c97506..8243afbf6 100644 --- a/plugins/tweak/tweaks/block-labors.h +++ b/plugins/tweak/tweaks/block-labors.h @@ -16,12 +16,13 @@ struct block_labors_hook : df::viewscreen_dwarfmodest { inline bool valid_mode() { return ui->main.mode == df::ui_sidebar_mode::ViewUnits && - ui_unit_view_mode->value == df::ui_unit_view_mode::T_value::PrefLabor; + ui_unit_view_mode->value == df::ui_unit_view_mode::T_value::PrefLabor && + Gui::getAnyUnit(this); } inline bool forbidden_labor (df::unit *unit, df::unit_labor labor) { - return is_valid_enum_item(labor) && !Units::isValidLabor(unit, labor); + return is_valid_enum_item(labor) && unit && !Units::isValidLabor(unit, labor); } inline bool all_labors_enabled (df::unit *unit, df::unit_labor_category cat)