Merge branch 'master' of https://github.com/buddhi1980/mandelbulber2

buddhi1980 · Mar 29, 2018 · 7492e24 · 7492e24
2 parents 524c09e + 1b453f7
commit 7492e24
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/mandelbulber2/src/audio_track.cpp b/mandelbulber2/src/audio_track.cpp
@@ -92,6 +92,9 @@ void cAudioTrack::Clear()
 void cAudioTrack::LoadAudio(const QString &_filename)
 {
 	QString filename = FilePathHelperSounds(_filename);
+	// check if file exists
+	QFileInfo file(filename);
+	if (!(file.exists() && file.isFile())) return;
 
 	WriteLogString("Loading audio started", filename, 2);
 

diff --git a/mandelbulber2/src/audio_track_collection.cpp b/mandelbulber2/src/audio_track_collection.cpp
@@ -233,8 +233,6 @@ void cAudioTrackCollection::LoadAllAudioFiles(cParameterContainer *params)
 				filename = cachedFileName;
 			}
 		}
-		// skip if invalid
-		else break;
 		// TEMPORARY CODE TO LOAD AUDIO OVER HTTP AND CACHE
 
 		if (!filename.isEmpty() && !audioTracks[listOfAllParameters[i]]->isLoaded())