Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.5.x' of dev.sourcefabric.org:airtime into 2.5.x

This commit is contained in:
Naomi 2013-10-15 15:39:38 -04:00
parent 48f11d403a f166d966f9
commit f72bbefb78
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
airtime_mvc/application/models/Scheduler.php
View File

@ -535,6 +535,9 @@ class Application_Model_Scheduler
$linked = false; $linked = false;
foreach ($scheduleItems as $schedule) { foreach ($scheduleItems as $schedule) {
//reset
$this->applyCrossfades = true;
$id = intval($schedule["id"]); $id = intval($schedule["id"]);
/* Find out if the show where the cursor position (where an item will /* Find out if the show where the cursor position (where an item will
@ -597,6 +600,9 @@ class Application_Model_Scheduler
$excludePositions = array(); $excludePositions = array();
foreach($instances as &$instance) { foreach($instances as &$instance) {
//reset
$this->applyCrossfades = true;
$instanceId = $instance["id"]; $instanceId = $instance["id"];
if ($id !== 0) { if ($id !== 0) {
/* We use the selected cursor's position to find the same /* We use the selected cursor's position to find the same
@ -616,11 +622,6 @@ class Application_Model_Scheduler
$instanceId); $instanceId);
$pos++; $pos++;
/* Show is not empty so we need to apply crossfades
* for the first inserted item
*/
//$applyCrossfades = true;
} }
//selected empty row to add after //selected empty row to add after
else { else {