From f5ec127eaf56d64d8f05908f50f9723296b791ab Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Sat, 3 Apr 2021 22:09:24 +0200 Subject: [PATCH] Fix #14409: NPE when demolishing banner --- src/openrct2-ui/windows/Banner.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/openrct2-ui/windows/Banner.cpp b/src/openrct2-ui/windows/Banner.cpp index a97a3ae8d5..4c0bc8ad23 100644 --- a/src/openrct2-ui/windows/Banner.cpp +++ b/src/openrct2-ui/windows/Banner.cpp @@ -172,6 +172,9 @@ public: break; case WIDX_BANNER_DEMOLISH: { + if (_banner == nullptr || _tileElement == nullptr) + break; + auto bannerRemoveAction = BannerRemoveAction( { _banner->position.ToCoordsXY(), _tileElement->GetBaseZ(), _tileElement->GetPosition() }); GameActions::Execute(&bannerRemoveAction);