From 817f7d80039d667922f9ee05f3d6248932b1fba9 Mon Sep 17 00:00:00 2001
From: Clemens Zeidler <clemens.zeidler@googlemail.com>
Date: Tue, 2 Aug 2011 10:56:39 +0000
Subject: [PATCH] Check if there is still a decorator. Fixes #7894.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42540 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/servers/app/Window.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/servers/app/Window.cpp b/src/servers/app/Window.cpp
index 25d034f28b..32fbe90b1e 100644
--- a/src/servers/app/Window.cpp
+++ b/src/servers/app/Window.cpp
@@ -2097,7 +2097,8 @@ Window::DetachFromWindowStack(bool ownStackNeeded)
 
 	Window* remainingTop = fCurrentStack->TopLayerWindow();
 	if (remainingTop != NULL) {
-		decorator->SetDrawingEngine(remainingTop->fDrawingEngine);
+		if (decorator != NULL)
+			decorator->SetDrawingEngine(remainingTop->fDrawingEngine);
 		// propagate focus to the decorator
 		remainingTop->SetFocus(remainingTop->IsFocus());
 		remainingTop->SetFeel(remainingTop->Feel());