summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorT.M.Speight <T.M.Speight.90@cantab.net>2011-10-25 15:35:21 (GMT)
committer Raymond Wagner <rwagner@mythtv.org>2011-10-25 15:37:15 (GMT)
commitfdfc989ebfe161fd58d977b38a4f2dd75aff1880 (patch)
tree494f843d8660ce07aff07159b966ec267fb155dd
parent347ff577262d5a162430438875e0fabb2f2ca79c (diff)
Correct copy/paste error in postroll commercial detection
Corrects an incorrect variable use that was missed when copying a similar block of code added in 9f5ee51db82. Fixes #10120 Refs #6889 Signed-off-by: Raymond Wagner <rwagner@mythtv.org> (cherry picked from commit 39c61832fb8e9e17fecf478426e67a223f6bd008)
-rw-r--r--mythtv/programs/mythcommflag/PrePostRollFlagger.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/mythtv/programs/mythcommflag/PrePostRollFlagger.cpp b/mythtv/programs/mythcommflag/PrePostRollFlagger.cpp
index de0ec61..40e8e5a 100644
--- a/mythtv/programs/mythcommflag/PrePostRollFlagger.cpp
+++ b/mythtv/programs/mythcommflag/PrePostRollFlagger.cpp
@@ -394,10 +394,11 @@ void PrePostRollFlagger::GetCommercialBreakList(frm_dir_map_t &marks)
end = closestAfterPre;
else
end = closestBeforePre;
- }else if(closestBeforePre)
+ }
+ else if(closestBeforePre)
end = closestBeforePre;
else if(closestAfterPre)
- end = closestAfterPre;
+ end = closestAfterPre;
else
end = preRoll;
@@ -419,7 +420,7 @@ void PrePostRollFlagger::GetCommercialBreakList(frm_dir_map_t &marks)
else if(closestBeforePost)
start = closestBeforePost;
else if(closestAfterPost)
- start = closestAfterPre;
+ start = closestAfterPost;
else if(postRoll)
start = myTotalFrames - postRoll;