Merge with develop

--HG-- branch : compatibility-develop
2017-03-25 15:01:22 +02:00 · 2017-03-25 15:01:22 +02:00 · 946b509700
commit 946b509700
parent 71e4004dd0 2eab033283
1 changed files with 5 additions and 0 deletions
--- a/code/ryzom/client/src/interface_v3/music_player.cpp
+++ b/code/ryzom/client/src/interface_v3/music_player.cpp
@ -353,6 +353,11 @@ public:
 					continue;
 				}

+				if (!CFile::fileExists(filenames[i])) {
+					nlwarning("Ignore non-existing file '%s'", filenames[i].c_str());
+					continue;
+				}
+
 				CMusicPlayer::CSongs song;
 				song.Filename = filenames[i];
 				SoundMngr->getMixer()->getSongTitle(filenames[i], song.Title, song.Length);