From 80258f1fb7d632edfbd35195b01c5a32350f53d8 Mon Sep 17 00:00:00 2001
From: denise <denise@denise-DX4860sourcefabric.org>
Date: Wed, 29 Aug 2012 16:13:18 -0400
Subject: [PATCH] CC-4302: Library : Deletion of newly created Smart Block does
 not prevent you from editing it which leads to small hang up

-fixed for dragging tracks into deleted blocks
---
 airtime_mvc/application/controllers/PlaylistController.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/airtime_mvc/application/controllers/PlaylistController.php b/airtime_mvc/application/controllers/PlaylistController.php
index 3104e31e6..97e2b3d73 100644
--- a/airtime_mvc/application/controllers/PlaylistController.php
+++ b/airtime_mvc/application/controllers/PlaylistController.php
@@ -124,10 +124,10 @@ class PlaylistController extends Zend_Controller_Action
         Logging::info("{$p_type} not found");
         Application_Model_Library::changePlaylist(null, $p_type);
         
-        if ($p_type == 'Playlist') {
+        if (!$p_isJson) {
             $this->createFullResponse(null);
         } else {
-            die(json_encode(array("error"=>$this->view->error, "result"=>1, "html"=>$this->createFullResponse(null, true))));
+            die(json_encode(array("error"=>$this->view->error, "result"=>1, "html"=>$this->createFullResponse(null, $p_isJson))));
         }
     }
 
@@ -288,6 +288,8 @@ class PlaylistController extends Zend_Controller_Action
             $this->wrongTypeToPlaylist($obj);
         } catch (BlockDynamicException $e) {
             $this->blockDynamic($obj);
+        } catch (BlockNotFoundException $e) {
+            $this->playlistNotFound($obj_type);
         } catch (Exception $e) {
             $this->playlistUnknownError($e);
         }