From 7263bfec9a6511fc8f5c79135a7c853156560755 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Wed, 3 Oct 2012 12:24:03 +0100
Subject: be more tolerant of temporary frameless parents

Change-Id: I61a52d0f5a5e29d271c84fd7b85d80b7fac2e2ec
---
 vcl/source/window/window.cxx | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'vcl')

diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index d874d811527b..44f1a584fc31 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -1039,10 +1039,12 @@ void Window::ImplInsertWindow( Window* pParent )
     mpWindowImpl->mpParent            = pParent;
     mpWindowImpl->mpRealParent        = pParent;
 
-    if ( pParent && !mpWindowImpl->mbFrame )
+    Window* pFrameParent = NULL;
+    if (pParent && !mpWindowImpl->mbFrame)
+        pFrameParent = pParent->mpWindowImpl->mpFrameWindow;
+    if (pFrameParent)
     {
         // search frame window and set window frame data
-        Window* pFrameParent = pParent->mpWindowImpl->mpFrameWindow;
         mpWindowImpl->mpFrameData     = pFrameParent->mpWindowImpl->mpFrameData;
         mpWindowImpl->mpFrame         = pFrameParent->mpWindowImpl->mpFrame;
         mpWindowImpl->mpFrameWindow   = pFrameParent;
-- 
cgit