diff options
| author | Kacper Michajłow <kasper93@gmail.com> | 2014-10-25 13:37:59 +0400 |
|---|---|---|
| committer | Kacper Michajłow <kasper93@gmail.com> | 2014-10-27 00:59:44 +0300 |
| commit | c16b2b07bc19596c59758a203ca34b597b477210 (patch) | |
| tree | ffb7dc1abc77faca9bf33246db5d531c1708320d | |
| parent | c8e842018f733b73930e24b4a396d4245b9c9c57 (diff) | |
Give after playback single time event precedence over loops.
Fixes #4978
| -rw-r--r-- | docs/Changelog.txt | 1 | ||||
| -rw-r--r-- | src/mpc-hc/MainFrm.cpp | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/docs/Changelog.txt b/docs/Changelog.txt index d88ad28f4..e1042e160 100644 --- a/docs/Changelog.txt +++ b/docs/Changelog.txt @@ -16,6 +16,7 @@ next version - not released yet + Ticket #4941, Support embedded cover-art
* DVB: Improve channel switching speed
* The "Properties" dialog should open faster being that the MediaInfo analysis is now done asynchronously
+* Ticket #4978, Execute "once" after playback event when playlist ends, regardless of the loop count
* Ticket #4991, Text subtitles: "opaque box" outlines will now always be drawn even if the border width is set to 0.
The size of the text is independent of the border width so there is no reason not to draw that part
* Updated Little CMS to v2.7 (git 8174681)
diff --git a/src/mpc-hc/MainFrm.cpp b/src/mpc-hc/MainFrm.cpp index 10058a0de..ebf6f4fea 100644 --- a/src/mpc-hc/MainFrm.cpp +++ b/src/mpc-hc/MainFrm.cpp @@ -2325,12 +2325,16 @@ void CMainFrame::GraphEventComplete() }
}
+ bool bBreak = false;
if (m_wndPlaylistBar.IsAtEnd()) {
++m_nLoops;
+ bBreak = !!(s.nCLSwitches & CLSW_AFTERPLAYBACK_MASK);
}
if (s.fLoopForever || m_nLoops < s.nLoops) {
- if (m_wndPlaylistBar.GetCount() > 1) {
+ if (bBreak) {
+ DoAfterPlaybackEvent();
+ } else if (m_wndPlaylistBar.GetCount() > 1) {
int nLoops = m_nLoops;
SendMessage(WM_COMMAND, ID_NAVIGATE_SKIPFORWARD);
m_nLoops = nLoops;
|