From 97a4e1b59ef4b93547d47b0e81edb3619613953a Mon Sep 17 00:00:00 2001 From: Charles Pigott Date: Mon, 5 Jan 2026 18:10:00 +0000 Subject: [PATCH] Fix: [Fluidsynth] Don't try to load the default soundfont if it's not set or doesn't exist --- src/music/fluidsynth.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/music/fluidsynth.cpp b/src/music/fluidsynth.cpp index 269c1c0fc9..b46e4c21e5 100644 --- a/src/music/fluidsynth.cpp +++ b/src/music/fluidsynth.cpp @@ -115,11 +115,12 @@ std::optional MusicDriver_FluidSynth::Start(const StringList & sfont_id = FLUID_FAILED; /* Try loading the default soundfont registered with FluidSynth. */ - char *default_soundfont; + char *default_soundfont = nullptr; fluid_settings_dupstr(_midi.settings, "synth.default-soundfont", &default_soundfont); - if (fluid_is_soundfont(default_soundfont)) { + if (default_soundfont != nullptr && std::filesystem::exists(default_soundfont) && fluid_is_soundfont(default_soundfont)) { sfont_id = fluid_synth_sfload(_midi.synth, default_soundfont, 1); } + fluid_free(default_soundfont); /* If no default soundfont found, try our own list. */ if (sfont_id == FLUID_FAILED) {