CC-5318 : Playout History: The last song of the show will display wro…

…ng end time.
awoehler · Sep 1, 2013 · 4a4ef27 · 4a4ef27
1 parent 619dbf7
commit 4a4ef27
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/airtime_mvc/application/services/HistoryService.php b/airtime_mvc/application/services/HistoryService.php
@@ -526,10 +526,14 @@ public function insertPlayedItem($schedId) {
 				$metadata = array();
 				$metadata["showname"] = $show->getDbName();
 
+				$instanceEnd = $showInstance->getDbEnds(null);
+				$itemEnd = $item->getDbEnds(null);
+				$recordEnd = ($instanceEnd < $itemEnd) ? $instanceEnd : $itemEnd;
+
 				$history = new CcPlayoutHistory();
 				$history->setDbFileId($fileId);
 				$history->setDbStarts($item->getDbStarts(null));
-				$history->setDbEnds($item->getDbEnds(null));
+				$history->setDbEnds($recordEnd);
 				$history->setDbInstanceId($item->getDbInstanceId());
 
 				foreach ($metadata as $key => $val) {