Merge with develop

--HG--
branch : compatibility-develop
This commit is contained in:
Nimetu 2016-08-30 18:39:58 +03:00
commit a86c38648b

View file

@ -283,7 +283,7 @@ public:
// Add songs from playlists // Add songs from playlists
for (i = 0; i < playlists.size(); ++i) for (i = 0; i < playlists.size(); ++i)
{ {
addFromPlaylist(filesToProcess[i], filenames); addFromPlaylist(playlists[i], filenames);
} }
// Build the songs array // Build the songs array