GME Plugin: only load m3u if it exists

If you load an NSFE file (which has embedded track titles), then attempt to load an M3U file, it causes GME to lose all information found in the NSFE file. This adds a check that the M3U file exists before attempting to load.

GME Plugin: only load m3u if it exists
9256e748 · John Regan · af033c0d · 9256e748
Commit 9256e748 authored Sep 26, 2017 by John Regan
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 1 deletion

GmeDecoderPlugin.cxx src/decoder/plugins/GmeDecoderPlugin.cxx +9 -1

No files found.
--- a/src/decoder/plugins/GmeDecoderPlugin.cxx
+++ b/src/decoder/plugins/GmeDecoderPlugin.cxx
@@ -27,6 +27,7 @@
 #include "tag/Builder.hxx"
 #include "fs/Path.hxx"
 #include "fs/AllocatedPath.hxx"
+#include "fs/FileSystem.hxx"
 #include "util/ScopeExit.hxx"
 #include "util/FormatString.hxx"
 #include "util/UriUtil.hxx"
@@ -126,7 +127,14 @@ LoadGmeAndM3u(GmeContainerPath container) {
 	std::string m3u_path(path,suffix);
 	m3u_path += "m3u";

-	gme_load_m3u(emu,m3u_path.c_str());
+    /*
+     * Some GME formats lose metadata if you attempt to
+     * load a non-existant M3U file, so check that one
+     * exists before loading.
+     */
+	if(FileExists(Path::FromFS(m3u_path.c_str()))) {
+		gme_load_m3u(emu,m3u_path.c_str());
+	}
 	return emu;
 }