Выполняем IAMOpenProgress::AbortOperation перед закрытием графа. Это …

…устранит зависание плеера с некоторыми проблемными URL.
Aleksoid1978 · Aug 4, 2024 · af7eb07 · af7eb07
1 parent a5789b0
commit af7eb07
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/src/apps/mplayerc/MainFrm.cpp b/src/apps/mplayerc/MainFrm.cpp
@@ -17651,6 +17651,19 @@ void CMainFrame::CloseMedia(BOOL bNextIsOpened/* = FALSE*/)
 		m_fOpeningAborted = true;
 
 		if (m_pGB) {
+			if (!m_pAMOP) {
+				m_pAMOP = m_pGB;
+				if (!m_pAMOP) {
+					BeginEnumFilters(m_pGB, pEF, pBF)
+						if (m_pAMOP = pBF) {
+							break;
+						}
+					EndEnumFilters;
+				}
+			}
+			if (m_pAMOP) {
+				m_pAMOP->AbortOperation();
+			}
 			m_pGB->Abort();    // TODO: lock on graph objects somehow, this is not thread safe
 		}