From e903d8cb0f2bbceea02d81224eae9048d406556e Mon Sep 17 00:00:00 2001
From: Jonas Kulla <Nyocurio@gmail.com>
Date: Tue, 24 Sep 2013 23:00:16 +0200
Subject: [PATCH] One last null pointer deref slipped through ;)

---
 src/window.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/window.cpp b/src/window.cpp
index 83a95d6..311aad6 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -725,7 +725,8 @@ void Window::setContents(Bitmap *value)
 {
 	GUARD_DISPOSED;
 
-	value->ensureNonMega();
+	if (value)
+		value->ensureNonMega();
 
 	p->contents = value;
 	p->controlsVertDirty = true;