From c5b761bff34a9ba4a87e72e884fa27bbf0684184 Mon Sep 17 00:00:00 2001
From: Naomi Aro <naomiaro@gmail.com>
Date: Mon, 2 Apr 2012 15:31:02 +0200
Subject: [PATCH] CC-3542 : When you delete the current show it takes all songs
 from that show out of the playout history

---
 airtime_mvc/application/models/Scheduler.php | 33 +++++++++++---------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/airtime_mvc/application/models/Scheduler.php b/airtime_mvc/application/models/Scheduler.php
index c5adc6c6e..30e5a385d 100644
--- a/airtime_mvc/application/models/Scheduler.php
+++ b/airtime_mvc/application/models/Scheduler.php
@@ -552,23 +552,26 @@ class Application_Model_Scheduler {
         try {
            
             $instance = CcShowInstancesQuery::create()->findPK($p_id);
-            
-            $items = CcScheduleQuery::create()
-                ->filterByDbInstanceId($p_id)
-                ->filterByDbEnds($this->nowDT, Criteria::GREATER_THAN)
-                ->find($this->con);
             
-            $remove = array();
-            $ts = $this->nowDT->format('U');
-            
-            for($i = 0; $i < count($items); $i++) {
-                $remove[$i]["instance"] = $p_id;
-                $remove[$i]["timestamp"] = $ts;
-                $remove[$i]["id"] = $items[$i]->getDbId();
+            if (!$instance->getDbRecord()) {
+                
+                $items = CcScheduleQuery::create()
+                    ->filterByDbInstanceId($p_id)
+                    ->filterByDbEnds($this->nowDT, Criteria::GREATER_THAN)
+                    ->find($this->con);
+                
+                $remove = array();
+                $ts = $this->nowDT->format('U');
+                
+                for($i = 0; $i < count($items); $i++) {
+                    $remove[$i]["instance"] = $p_id;
+                    $remove[$i]["timestamp"] = $ts;
+                    $remove[$i]["id"] = $items[$i]->getDbId();
+                }
+                
+                $this->removeItems($remove, false);
             }
-            
-            $this->removeItems($remove, false);
-            
+ 
             $instance->setDbEnds($this->nowDT);
             $instance->save($this->con);