Re-design the cleanup functionality of the tray icon

Instead of the tray icon thread trying to clean itself up, call the
destructor externally and wait until it closed itself.
This ensures all resources are free'ed and no race conditions can cause
invalid access later on.

Suggested by Lord.

1 files changed, 4 insertions, 14 deletions

diff --git a/demuxer/LAVSplitter/LAVSplitter.cpp b/demuxer/LAVSplitter/LAVSplitter.cpp
index f55587f0..a595a239 100644
--- a/demuxer/LAVSplitter/LAVSplitter.cpp
+++ b/demuxer/LAVSplitter/LAVSplitter.cpp
@@ -89,10 +89,7 @@ CLAVSplitter::CLAVSplitter(LPUNKNOWN pUnk, HRESULT* phr)
 CLAVSplitter::~CLAVSplitter()
 {
   SAFE_DELETE(m_pInput);
-  if (m_pTrayIcon) {
-    m_pTrayIcon->Destroy();
-    m_pTrayIcon = NULL;
-  }
+  SAFE_DELETE(m_pTrayIcon);
   Close();
 
   // delete old pins
@@ -140,8 +137,7 @@ STDMETHODIMP CLAVSplitter::JoinFilterGraph(IFilterGraph * pGraph, LPCWSTR pName)
   if (pGraph && !m_pTrayIcon && m_settings.TrayIcon) {
     CreateTrayIcon();
   } else if (!pGraph && m_pTrayIcon) {
-    m_pTrayIcon->Destroy();
-    m_pTrayIcon = NULL;
+    SAFE_DELETE(m_pTrayIcon);
   }
   return hr;
 }
@@ -1522,10 +1518,7 @@ HRESULT CLAVSplitter::SetRuntimeConfig(BOOL bRuntimeConfig)
   LoadSettings();
 
   // Tray Icon is disabled by default
-  if (m_pTrayIcon) {
-    m_pTrayIcon->Destroy();
-    m_pTrayIcon = NULL;
-  }
+  SAFE_DELETE(m_pTrayIcon);
 
   return S_OK;
 }
@@ -1746,10 +1739,7 @@ STDMETHODIMP CLAVSplitter::SetTrayIcon(BOOL bEnabled)
 {
   m_settings.TrayIcon = bEnabled;
   if (!bEnabled && m_pTrayIcon) {
-    if (m_pTrayIcon) {
-      m_pTrayIcon->Destroy();
-      m_pTrayIcon = NULL;
-    }
+    SAFE_DELETE(m_pTrayIcon);
   } else if (bEnabled && m_pGraph && !m_pTrayIcon) {
     CreateTrayIcon();
   }