iiiypuk/cantata
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

When adding songs to an existing play lists, dont allow play list files to be added.

Browse Source 
BUG: 372
This commit is contained in:
craig.p.drummond
2013-12-31 09:08:14 +00:00
committed by craig.p.drummond
parent 0fc8ecb33e
commit 164cf713aa
4 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -33,6 +33,8 @@
5. If icon theme does not have network-server, then use audio file icon for
HTTP server settings page.
6. Fix truncated files served from internal HTTP server.
7. When adding songs to an existing play lists, dont allow play list files to
be added.
1.2.1
-----

2
gui/albumspage.cpp
View File

@@ -201,7 +201,7 @@ Song AlbumsPage::coverRequest() const
void AlbumsPage::addSelectionToPlaylist(const QString &name, bool replace, quint8 priorty, bool randomAlbums)
{
QStringList files=selectedFiles(true, randomAlbums);
QStringList files=selectedFiles(name.isEmpty(), randomAlbums);
if (!files.isEmpty()) {
if (name.isEmpty()) {

2
gui/folderpage.cpp
View File

@@ -235,7 +235,7 @@ QStringList FolderPage::selectedFiles(bool allowPlaylists) const
void FolderPage::addSelectionToPlaylist(const QString &name, bool replace, quint8 priorty)
{
QStringList files=selectedFiles(true);
QStringList files=selectedFiles(name.isEmpty());
if (!files.isEmpty()) {
if (name.isEmpty()) {

2
gui/librarypage.cpp
View File

@@ -226,7 +226,7 @@ Song LibraryPage::coverRequest() const
void LibraryPage::addSelectionToPlaylist(const QString &name, bool replace, quint8 priorty, bool randomAlbums)
{
QStringList files=selectedFiles(true, randomAlbums);
QStringList files=selectedFiles(name.isEmpty(), randomAlbums);
if (!files.isEmpty()) {
if (name.isEmpty()) {