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();
 }