Make the drum channel substitution algorithm more comprehensible

FluidSynth · Feb 8, 2025 · 758da2d · 758da2d
1 parent e3c62fa
commit 758da2d
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/synth/fluid_synth.c b/src/synth/fluid_synth.c
@@ -3135,9 +3135,13 @@ fluid_synth_program_change(fluid_synth_t *synth, int chan, int prognum)
             /* Percussion: Fallback to preset 0 in percussion bank */
             if(channel->channel_type == CHANNEL_TYPE_DRUM)
             {
-                subst_prog = 0;
                 subst_bank = DRUM_INST_BANK;
                 preset = fluid_synth_find_preset(synth, subst_bank, subst_prog);
+                if(!preset)
+                {
+                    subst_prog = 0;
+                    preset = fluid_synth_find_preset(synth, subst_bank, subst_prog);
+                }
             }
             /* Melodic instrument */
             else