From 1320a491168d43f176f67af8a19decdc5cf24b30 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <slouken@libsdl.org>
Date: Thu, 12 Oct 2017 23:05:15 -0700
Subject: [PATCH] Description: no sf2 sound fonts loaded by default Introduced
 in 1.2.12-6 (Thu, 11 Jul 2013 12:17:15 +0100) Author: Fabian Greffrath
 <fabian@greffrath.com> Last-Update: 2014-10-24 Bug-Debian:
 http://bugs.debian.org/715461

---
 mixer.c |  5 +++++
 music.c | 11 ++++++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/mixer.c b/mixer.c
index 9ab5e76b..8decf1a1 100644
--- a/mixer.c
+++ b/mixer.c
@@ -151,6 +151,11 @@ int Mix_Init(int flags)
 {
     int result = 0;
 
+#ifdef MIX_INIT_SOUNDFONT_PATHS
+    if (!soundfont_paths)
+        soundfont_paths = SDL_strdup(MIX_INIT_SOUNDFONT_PATHS);
+#endif
+
     if (flags & MIX_INIT_FLUIDSYNTH) {
 #ifdef USE_FLUIDSYNTH_MIDI
         if ((initialized & MIX_INIT_FLUIDSYNTH) || Mix_InitFluidSynth() == 0) {
diff --git a/music.c b/music.c
index e9d75f6d..2d8ddddd 100644
--- a/music.c
+++ b/music.c
@@ -1633,6 +1633,7 @@ int Mix_EachSoundFont(int (*function)(const char*, void*), void *data)
 {
     char *context, *path, *paths;
     const char* cpaths = Mix_GetSoundFonts();
+    int soundfonts_found = 0;
 
     if (!cpaths) {
         Mix_SetError("No SoundFonts have been requested");
@@ -1652,12 +1653,16 @@ int Mix_EachSoundFont(int (*function)(const char*, void*), void *data)
     for (path = strtok_r(paths, ":;", &context); path; path = strtok_r(NULL, ":;", &context)) {
 #endif
         if (!function(path, data)) {
-            SDL_free(paths);
-            return 0;
+            continue;
+        } else {
+            soundfonts_found++;
         }
     }
 
     SDL_free(paths);
-    return 1;
+    if (soundfonts_found > 0)
+        return 1;
+    else
+        return 0;
 }
 #endif