From 2631773e8220c863a57beaa29eece92db31c1edf Mon Sep 17 00:00:00 2001
From: Julian Smart <julian@anthemion.co.uk>
Date: Mon, 14 Mar 2011 10:27:01 +0000
Subject: [PATCH] Added initialisation and checks

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67182 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/msw/mediactrl_wmp10.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/msw/mediactrl_wmp10.cpp b/src/msw/mediactrl_wmp10.cpp
index fcc76a9219..2cfdb85e26 100644
--- a/src/msw/mediactrl_wmp10.cpp
+++ b/src/msw/mediactrl_wmp10.cpp
@@ -724,7 +724,9 @@ wxWMP10MediaBackend::wxWMP10MediaBackend()
 #ifndef WXTEST_ATL
                 m_pAX(NULL),
 #endif
-                m_pWMPPlayer(NULL)
+                m_pWMPPlayer(NULL),
+                m_pWMPSettings(NULL),
+                m_pWMPControls(NULL)
 
 {
     m_evthandler = NULL;
@@ -752,8 +754,10 @@ wxWMP10MediaBackend::~wxWMP10MediaBackend()
 #endif
 
         m_pWMPPlayer->Release();
-        m_pWMPSettings->Release();
-        m_pWMPControls->Release();
+        if (m_pWMPSettings)
+            m_pWMPSettings->Release();
+        if (m_pWMPControls)
+            m_pWMPControls->Release();
     }
 }
 
-- 
2.47.2