summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@suse.com>2013-06-11 11:47:28 +0100
committerMichael Meeks <michael.meeks@suse.com>2013-06-11 14:41:51 +0100
commit2b2f00e03cb4ad2abfe7787d966b67dabe6fb408 (patch)
treec9e6fe532d504807ba3f6cc3e0c9ccfd8ccc757a
parent7cf2b5809f7137acc7a5eed9159042b3d748da01 (diff)
protect against exception during construction.
Change-Id: Ied19ddc28dc8413a35ee7b7269cd6c6f22ca9a91
-rw-r--r--vcl/source/window/window.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index c76e2d76fede..1c8e8908ecc9 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -4598,7 +4598,7 @@ Window::~Window()
if ( pSVData->maWinData.mpLastDeacWin == this )
pSVData->maWinData.mpLastDeacWin = NULL;
- if ( mpWindowImpl->mbFrame )
+ if ( mpWindowImpl->mbFrame && mpWindowImpl->mpFrameData )
{
if ( mpWindowImpl->mpFrameData->mnFocusId )
Application::RemoveUserEvent( mpWindowImpl->mpFrameData->mnFocusId );