From 3caab7db1e6f4547cf7ba493ac60af39c79e5d26 Mon Sep 17 00:00:00 2001
From: naomiaro <naomiaro@gmail.com>
Date: Wed, 6 Oct 2010 16:52:12 -0400
Subject: [PATCH] always have new playlist option.

---
 htmlUI/templates/menu.tpl    | 7 +------
 htmlUI/ui_playlist.class.php | 4 ++--
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/htmlUI/templates/menu.tpl b/htmlUI/templates/menu.tpl
index 8fa881f73..317e8a276 100644
--- a/htmlUI/templates/menu.tpl
+++ b/htmlUI/templates/menu.tpl
@@ -35,14 +35,9 @@ if (window.attachEvent) window.attachEvent("onload", sfHover);
         </li>
         <li class="nav-main"><a>##Playlists##</a>
             <ul>
+            	<li><a onClick="hpopup('{$UI_HANDLER}?act=PL.create')">##New empty Playlist##</a></li>
                 {if $PL->getActiveId()}
                     <li><a href="{$UI_BROWSER}?id={$START.fid}&act=PL.simpleManagement">##Edit Playlist##</a></li>
-                {else}
-                    {if $PL->reportLookedPL()}
-                        <li><a onClick="hpopup('{$UI_HANDLER}?act=PL.unlook')">##Reopen Playlist##</a></li>
-                    {else}
-                        <li><a onClick="hpopup('{$UI_HANDLER}?act=PL.create')">##New empty Playlist##</a></li>
-                    {/if}
                 {/if}
                 <li><a href="{$UI_BROWSER}?act=PL.import">##Import Playlist##</a></li>
             </ul>
diff --git a/htmlUI/ui_playlist.class.php b/htmlUI/ui_playlist.class.php
index af9fe715a..321c3f467 100644
--- a/htmlUI/ui_playlist.class.php
+++ b/htmlUI/ui_playlist.class.php
@@ -276,9 +276,9 @@ class uiPlaylist
         // add clip if $id is set
        
         if ($this->activeId) {
-            $this->Base->_retMsg('A playlist is already opened.');
-            return FALSE;
+            $this->release();
         }
+        
         $datetime = strftime('%Y-%m-%d %H:%M:%S');
         $plid = $this->Base->gb->createPlaylist($datetime, $this->Base->sessid);