-
Notifications
You must be signed in to change notification settings - Fork 419
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Check IsDisposed before setting flags in SampleChannelBass
- Loading branch information
Showing
1 changed file
with
4 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,7 @@ | ||
// Copyright (c) ppy Pty Ltd <[email protected]>. Licensed under the MIT Licence. | ||
// See the LICENCE file in the repository root for full licence text. | ||
|
||
using System; | ||
using ManagedBass; | ||
using osu.Framework.Audio.Mixing.Bass; | ||
using osu.Framework.Audio.Track; | ||
|
@@ -130,8 +131,10 @@ protected override void UpdateState() | |
|
||
public override void Play() | ||
{ | ||
userRequestedPlay = true; | ||
// Check if this channel is disposed first to not set enqueuedPlaybackStart to true, which also sets Playing to true. | ||
ObjectDisposedException.ThrowIf(IsDisposed, this); | ||
|
||
userRequestedPlay = true; | ||
userRequestedStop = false; | ||
|
||
// Pin Playing and IsAlive to true so that the channel isn't killed by the next update. This is only reset after playback is started. | ||
|
@@ -152,7 +155,6 @@ public override void Play() | |
public override void Stop() | ||
{ | ||
userRequestedPlay = false; | ||
|
||
userRequestedStop = true; | ||
|
||
base.Stop(); | ||
|