From 5c91c9fed51bf10387a7673cb8c1ccd95e0469d0 Mon Sep 17 00:00:00 2001
From: Michael Meeks <michael.meeks@collabora.com>
Date: Thu, 26 Mar 2015 21:45:50 +0000
Subject: Fix LazyDelete crasher, and add & test more post-dispose robustness.

Change-Id: I0e9460cb33b7cb5da9ddb950ff27bac8cbf7fed8
---
 vcl/source/window/window2.cxx | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'vcl/source')

diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index 95468f3a5e9f..cf8fd3f930a0 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -975,27 +975,27 @@ vcl::Window* Window::ImplGetWindow()
 
 ImplFrameData* Window::ImplGetFrameData()
 {
-    return mpWindowImpl->mpFrameData;
+    return mpWindowImpl ? mpWindowImpl->mpFrameData : NULL;
 }
 
 SalFrame* Window::ImplGetFrame() const
 {
-    return mpWindowImpl->mpFrame;
+    return mpWindowImpl ? mpWindowImpl->mpFrame : NULL;
 }
 
 vcl::Window* Window::ImplGetParent() const
 {
-    return mpWindowImpl->mpParent;
+    return mpWindowImpl ? mpWindowImpl->mpParent.get() : NULL;
 }
 
 vcl::Window* Window::ImplGetClientWindow() const
 {
-    return mpWindowImpl->mpClientWindow;
+    return mpWindowImpl ? mpWindowImpl->mpClientWindow.get() : NULL;
 }
 
 vcl::Window* Window::ImplGetBorderWindow() const
 {
-    return mpWindowImpl->mpBorderWindow;
+    return mpWindowImpl ? mpWindowImpl->mpBorderWindow.get() : NULL;
 }
 
 vcl::Window* Window::ImplGetFirstOverlapWindow()
@@ -1237,7 +1237,7 @@ bool Window::IsReallyVisible() const
 
 bool Window::IsReallyShown() const
 {
-    return mpWindowImpl->mbReallyShown;
+    return mpWindowImpl ? mpWindowImpl->mbReallyShown : false;
 }
 
 bool Window::IsInInitShow() const
@@ -1247,12 +1247,12 @@ bool Window::IsInInitShow() const
 
 bool Window::IsEnabled() const
 {
-    return !mpWindowImpl->mbDisabled;
+    return mpWindowImpl ? !mpWindowImpl->mbDisabled : false;
 }
 
 bool Window::IsInputEnabled() const
 {
-    return !mpWindowImpl->mbInputDisabled;
+    return mpWindowImpl ? !mpWindowImpl->mbInputDisabled : false;
 }
 
 bool Window::IsAlwaysEnableInput() const
-- 
cgit