diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-03-02 22:02:19 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-09 22:35:14 +0100 |
| commit | 954e5e4b7820c5db3a6720dc9dc27e49cee449ac (patch) | |
| tree | a5136c84a45d3861f7271b9eced37e33aa274658 /avmedia | |
| parent | e8284454f517d29a29f95a347a38730ded047f41 (diff) | |
prophylactic double dispose audit.
Change-Id: Ia18c0b7a76fb0894efe33afaf69a0079c4583228
Diffstat (limited to 'avmedia')
| -rw-r--r-- | avmedia/source/framework/mediacontrol.cxx | 1 | ||||
| -rw-r--r-- | avmedia/source/viewer/mediawindow_impl.cxx | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx index e222a6416a72..617bbc340e08 100644 --- a/avmedia/source/framework/mediacontrol.cxx +++ b/avmedia/source/framework/mediacontrol.cxx @@ -203,6 +203,7 @@ void MediaControl::dispose() { maZoomToolBox->SetItemWindow( AVMEDIA_TOOLBOXITEM_ZOOM, NULL ); delete mpZoomListBox; + mpZoomListBox = NULL; maTimeEdit.disposeAndClear(); maZoomToolBox.disposeAndClear(); maVolumeSlider.disposeAndClear(); diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx index 2042858ff758..b2716eebf5cc 100644 --- a/avmedia/source/viewer/mediawindow_impl.cxx +++ b/avmedia/source/viewer/mediawindow_impl.cxx @@ -201,8 +201,11 @@ void MediaWindowImpl::dispose() mpMediaWindow = NULL; delete mpEmptyBmpEx; + mpEmptyBmpEx = NULL; delete mpAudioBmpEx; + mpAudioBmpEx = NULL; delete mpMediaWindowControl; + mpMediaWindowControl = NULL; Control::dispose(); } |