Merge with develop

--HG-- branch : compatibility-develop
2016-08-30 18:39:58 +03:00 · 2016-08-30 18:39:58 +03:00 · a86c38648b
commit a86c38648b
parent 8835bc7551 c2226fe3ff
1 changed files with 1 additions and 1 deletions
--- a/code/ryzom/client/src/interface_v3/music_player.cpp
+++ b/code/ryzom/client/src/interface_v3/music_player.cpp
@ -283,7 +283,7 @@ public:
 			// Add songs from playlists
 			for (i = 0; i < playlists.size(); ++i)
 			{
-				addFromPlaylist(filesToProcess[i], filenames);
+				addFromPlaylist(playlists[i], filenames);
 			}

 			// Build the songs array