Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mpc-hc/mpc-hc.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUnderground78 <underground78@users.sourceforge.net>2013-05-05 02:25:02 +0400
committerUnderground78 <underground78@users.sourceforge.net>2013-05-05 20:52:08 +0400
commit9c5bdfe645a41622e6fd4bfa471ff55014a62e30 (patch)
tree9edd3eacab0edbdbc5f18b25c764d4fb2a262b65
parent796bbf24ec52550322ddb21726c717476c7430dd (diff)
Fix: MPC-HC was sometimes slow to close (audio kept playing for a few seconds).
The wrong overloaded function was called when closing the media after 0615b154c1a9e6289234a5acb6c2360b1560577c. This commit fixes #3113.
-rw-r--r--docs/Changelog.txt1
-rw-r--r--src/mpc-hc/MainFrm.cpp2
2 files changed, 2 insertions, 1 deletions
diff --git a/docs/Changelog.txt b/docs/Changelog.txt
index 185eadea5..840fb9431 100644
--- a/docs/Changelog.txt
+++ b/docs/Changelog.txt
@@ -22,3 +22,4 @@ Legend:
the subpicture queue
! Ticket #3110, DVB: Improve compatibility with some drivers for which MPC-HC failed to find
any channel during the channel scan
+! Ticket #3113, MPC-HC was sometimes slow to close (audio kept playing for a few seconds)
diff --git a/src/mpc-hc/MainFrm.cpp b/src/mpc-hc/MainFrm.cpp
index 125b06235..ca76b6088 100644
--- a/src/mpc-hc/MainFrm.cpp
+++ b/src/mpc-hc/MainFrm.cpp
@@ -3566,7 +3566,7 @@ void CMainFrame::OnFilePostClosemedia()
if (IsWindow(m_wndSubresyncBar.m_hWnd)) {
ShowControlBar(&m_wndSubresyncBar, FALSE, TRUE);
- SetSubtitle(NULL);
+ SetSubtitle((ISubStream*)NULL); // NULL should be handled like a pointer, not an integer.
}
if (IsWindow(m_wndCaptureBar.m_hWnd)) {