From 6e7fd326db12fef4717c61f7cd7d13fe733249f5 Mon Sep 17 00:00:00 2001
From: Lynix <lynix680@gmail.com>
Date: Thu, 13 Jun 2019 19:06:09 +0200
Subject: [PATCH] SDK/BaseWidget: Fix possible crash when disabling background

---
 ChangeLog.md               | 1 +
 SDK/src/NDK/BaseWidget.cpp | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ChangeLog.md b/ChangeLog.md
index ea46c15c8..b2f71d16d 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -266,6 +266,7 @@ Nazara Development Kit:
 - Fixed a subtle bug regarding entities invalidation and kill (ex: if an entity #2 kills entity #1 during Entity::Destroy callbacks, entity #1 will survive destruction).
 - Added PhysicsSystem2D::[RaycastQuery, RegionQuery] overloads taking a callback
 - Added TextAreaWidget support for outline
+- Fixed possible crash when disabling BaseWidget background
 
 # 0.4:
 
diff --git a/SDK/src/NDK/BaseWidget.cpp b/SDK/src/NDK/BaseWidget.cpp
index 89ca6bb9c..499a7aa2b 100644
--- a/SDK/src/NDK/BaseWidget.cpp
+++ b/SDK/src/NDK/BaseWidget.cpp
@@ -89,6 +89,7 @@ namespace Ndk
 		}
 		else
 		{
+			DestroyEntity(m_backgroundEntity);
 			m_backgroundEntity.Reset();
 			m_backgroundSprite.Reset();
 		}
@@ -185,7 +186,7 @@ namespace Ndk
 
 	void BaseWidget::Layout()
 	{
-		if (m_backgroundEntity)
+		if (m_backgroundSprite)
 			m_backgroundSprite->SetSize(m_size.x, m_size.y);
 
 		UpdatePositionAndSize();