diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-02-26 16:50:17 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-09 22:23:28 +0100 |
| commit | abc903a5be857150b144f1439448d4f02edb0531 (patch) | |
| tree | b45db7eb940aeff03408b1d3f60f7690962347d4 /vcl | |
| parent | f0969f0de927e4f63ef4e111a1ffaa841f2a81ea (diff) | |
vcl: more double dispose protection.
Change-Id: Ib5c4ca5747cd55d7ea0f8c59b5aaa1f84c2a8fdc
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/window/split.cxx | 8 | ||||
| -rw-r--r-- | vcl/source/window/syswin.cxx | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/vcl/source/window/split.cxx b/vcl/source/window/split.cxx index bd4b3fec5620..f678900783f8 100644 --- a/vcl/source/window/split.cxx +++ b/vcl/source/window/split.cxx @@ -156,8 +156,12 @@ Splitter::~Splitter() void Splitter::dispose() { - TaskPaneList *pTList = GetSystemWindow()->GetTaskPaneList(); - pTList->RemoveWindow( this ); + SystemWindow *pSysWin = GetSystemWindow(); + if(pSysWin) + { + TaskPaneList *pTList = pSysWin->GetTaskPaneList(); + pTList->RemoveWindow(this); + } Window::dispose(); } diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx index 02f2417bbcc8..19768d771769 100644 --- a/vcl/source/window/syswin.cxx +++ b/vcl/source/window/syswin.cxx @@ -185,6 +185,8 @@ bool SystemWindow::PreNotify( NotifyEvent& rNEvt ) TaskPaneList* SystemWindow::GetTaskPaneList() { + if( !mpImplData ) + return NULL; if( mpImplData->mpTaskPaneList ) return mpImplData->mpTaskPaneList ; else |