Merge pull request #2118 from peppy/fix-null-channels

Remove null channels from SkinnableSound playable channels
This commit is contained in:
Dan Balasescu 2018-02-26 12:45:35 +09:00 committed by GitHub
commit dbb1d2b4aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -39,7 +39,7 @@ namespace osu.Game.Skinning
if (ch == null && allowFallback) if (ch == null && allowFallback)
ch = loadChannel(s, audio.Sample.Get); ch = loadChannel(s, audio.Sample.Get);
return ch; return ch;
}).ToArray(); }).Where(c => c != null).ToArray();
} }
private SampleChannel loadChannel(SampleInfo info, Func<string, SampleChannel> getSampleFunction) private SampleChannel loadChannel(SampleInfo info, Func<string, SampleChannel> getSampleFunction)