Use input name in 'new playlist' and 'load playlist' if p.name == None.

diff --git a/hooke/plugin/playlist.py b/hooke/plugin/playlist.py
index 912d21c3aad05fc566dc8ddfc99f7df2fadbbedf..80c22d2ffa3628ebba2115ece97123d7f52dec78 100644 (file)
--- a/hooke/plugin/playlist.py
+++ b/hooke/plugin/playlist.py
@@ -248,7 +248,7 @@ Drivers for loading curves.
         p = FilePlaylist(drivers=params['drivers'], path=params['input'])
         p.load(hooke=hooke)
         playlist_names = [playlist.name for playlist in hooke.playlists]
         p = FilePlaylist(drivers=params['drivers'], path=params['input'])
         p.load(hooke=hooke)
         playlist_names = [playlist.name for playlist in hooke.playlists]

-        if p.name in playlist_names:
+        if p.name in playlist_names or p.name == None:

             p.name = params['output playlist']  # HACK: override input name.  How to tell if it is callback-generated?
         self._set_playlist(hooke, params, p)
        outqueue.put(p)
             p.name = params['output playlist']  # HACK: override input name.  How to tell if it is callback-generated?
         self._set_playlist(hooke, params, p)
        outqueue.put(p)

diff --git a/hooke/plugin/playlists.py b/hooke/plugin/playlists.py
index 2194b0409a67e1247a279660375edaa61672bb14..ccd5020ab09b8698a194d4423aac851730e77525 100644 (file)
--- a/hooke/plugin/playlists.py
+++ b/hooke/plugin/playlists.py
@@ -120,6 +120,6 @@ Default filename for future saves.
             path=params['file'],
             )
         playlist_names = [playlist.name for playlist in hooke.playlists]
             path=params['file'],
             )
         playlist_names = [playlist.name for playlist in hooke.playlists]

-        if p.name in playlist_names:
+        if p.name in playlist_names or p.name == None:

             p.name = params['output playlist']  # HACK: override input name.  How to tell if it is callback-generated?
         hooke.playlists.append(p)
             p.name = params['output playlist']  # HACK: override input name.  How to tell if it is callback-generated?
         hooke.playlists.append(p)