Skip to content

Commit

Permalink
Merge pull request #6214 from smoogipoo/temporarily-remove-effect-pri…
Browse files Browse the repository at this point in the history
…ority

Remove effect prioritisation to fix segfaults
  • Loading branch information
peppy committed Mar 14, 2024
2 parents 94f2e77 + b12b8a7 commit 60576e2
Showing 1 changed file with 1 addition and 8 deletions.
9 changes: 1 addition & 8 deletions osu.Framework/Audio/Mixing/Bass/BassAudioMixer.cs
Expand Up @@ -10,7 +10,6 @@
using ManagedBass;
using ManagedBass.Mix;
using osu.Framework.Bindables;
using osu.Framework.Development;
using osu.Framework.Extensions.EnumExtensions;
using osu.Framework.Extensions.ObjectExtensions;
using osu.Framework.Statistics;
Expand Down Expand Up @@ -421,13 +420,7 @@ void applyEffects(int startIndex, int endIndex)
// Effects with greatest priority are stored at the front of the list.
effect.Priority = -i;
if (effect.Handle != 0)
{
// Todo: Temporary bypass to attempt to fix failing test runs.
if (!DebugUtils.IsNUnitRunning)
ManagedBass.Bass.FXSetPriority(effect.Handle, effect.Priority);
}
else
if (effect.Handle == 0)
effect.Handle = ManagedBass.Bass.ChannelSetFX(Handle, effect.Effect.FXType, effect.Priority);
ManagedBass.Bass.FXSetParameters(effect.Handle, effect.Effect);
Expand Down

0 comments on commit 60576e2

Please sign in to comment.