From 51d983c5f61eb9f7690af9ff0f7841516dc44d4e Mon Sep 17 00:00:00 2001
From: naomiaro <naomiaro@gmail.com>
Date: Wed, 6 Oct 2010 16:45:20 -0400
Subject: [PATCH] get rid of close button

---
 htmlUI/templates/playlist/editor.tpl | 1 -
 htmlUI/ui_playlist.class.php         | 6 ++----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/htmlUI/templates/playlist/editor.tpl b/htmlUI/templates/playlist/editor.tpl
index 8b07dd8ac..2f12112c4 100644
--- a/htmlUI/templates/playlist/editor.tpl
+++ b/htmlUI/templates/playlist/editor.tpl
@@ -57,7 +57,6 @@
         <input type="button" class="button_large" onClick="collector_clearAll('PL', 'PL.removeItem')" value="##Clear Playlist##" />
     </div>
     <div class="pl_container_button">
-        <input type="button" class="button_large" onClick="popup('{$UI_BROWSER}?popup[]=PL.confirmRelease', 'PL.confirmRelease', 400, 50)" value="##Close Playlist##">
         <input type="button" class="button_large" value="##Description##"      onClick="location.href='{$UI_BROWSER}?act=PL.editMetaData'">
         <input type="button" class="button_large" value="##Delete Playlist##"  onClick="popup('{$UI_BROWSER}?popup[]=PL.confirmDelete',  'PL.deleteActive',   400, 50)">
     </div>
diff --git a/htmlUI/ui_playlist.class.php b/htmlUI/ui_playlist.class.php
index 73bffe872..af9fe715a 100644
--- a/htmlUI/ui_playlist.class.php
+++ b/htmlUI/ui_playlist.class.php
@@ -89,11 +89,9 @@ class uiPlaylist
         // store access token to ls_pref abd session
         // load PL into session
         if ($this->activeId) {
-            if (UI_WARNING) {
-            	$this->Base->_retMsg('You already have an open playlist. Close it first.');
-            }
-            return FALSE;
+            $this->release();
         }
+        
         $userid = $this->Base->gb->playlistIsAvailable($plid, $this->Base->sessid);
         if ($userid !== TRUE) {
              if (UI_WARNING) {