diff --git a/src/client/spark/core/Utility/KeyDrivenObservable.cs b/src/client/spark/core/Utility/KeyDrivenObservable.cs index b26f9a5d9..68a0211ae 100644 --- a/src/client/spark/core/Utility/KeyDrivenObservable.cs +++ b/src/client/spark/core/Utility/KeyDrivenObservable.cs @@ -17,7 +17,8 @@ namespace mbts.utils { /// class KeyDrivenObservableSeries : ISubject, IDisposable { readonly Func> _selector; - object _lock = new object(); + readonly object _lock = new object(); + bool _is_disposed; Subject _value_subject = new Subject(); IDisposable _current_key_sub; @@ -31,15 +32,19 @@ namespace mbts.utils { // need to lock bc simultaneous callbacks on diff threads could generate 2 subscriptions at once, // only 1 of which would get disposed in the next callback. Disposable.dispose(ref _current_key_sub); - _current_key_sub = _selector(key)?.Subscribe(_value_subject); + if (!_is_disposed) + _current_key_sub = _selector(key)?.Subscribe(_value_subject); } } public IDisposable Subscribe(IObserver observer) => _value_subject.Subscribe(observer); public void Dispose() { - Disposable.dispose(ref _current_key_sub); - Disposable.dispose(ref _value_subject); + lock (_lock) { + _is_disposed = true; + Disposable.dispose(ref _current_key_sub); + Disposable.dispose(ref _value_subject); + } } }