diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-02-17 17:13:40 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-09 22:21:54 +0100 |
| commit | 6b7bad4da3b899c191a4a414e1ea8a722110029b (patch) | |
| tree | 20f4c7e0c4a6dd5093e21ae709841f3a2f6cad8b /svtools | |
| parent | vclref: re-work mbInDtor handling, add IsDisposed method and more. (diff) | |
| download | core-6b7bad4da3b899c191a4a414e1ea8a722110029b.tar.gz core-6b7bad4da3b899c191a4a414e1ea8a722110029b.zip | |
protect against double dispose.
Change-Id: Ib168188f7cfd8d4e0e6fe0617c5c9b7de840016b
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/contnr/ivctrl.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/svtools/source/contnr/ivctrl.cxx b/svtools/source/contnr/ivctrl.cxx index 1baa80cdd890..3e8db3bca16f 100644 --- a/svtools/source/contnr/ivctrl.cxx +++ b/svtools/source/contnr/ivctrl.cxx @@ -93,8 +93,12 @@ SvtIconChoiceCtrl::~SvtIconChoiceCtrl() void SvtIconChoiceCtrl::dispose() { - _pImp->CallEventListeners( VCLEVENT_OBJECT_DYING ); - delete _pImp; + if (_pImp) + { + _pImp->CallEventListeners( VCLEVENT_OBJECT_DYING ); + delete _pImp; + _pImp = NULL; + } Control::dispose(); } |