From 34cdaeec932fd50d831d17a382b4d4d9fdaecb28 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Sun, 7 Jun 2020 16:01:27 -0500 Subject: [PATCH] don't use Disposable.replace bc it creates the next disposable before disposing the previous one --- .../Modules/Trading/Ladder/VM/LadderVMContainer.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/client/spark/Modules/Trading/Ladder/VM/LadderVMContainer.cs b/src/client/spark/Modules/Trading/Ladder/VM/LadderVMContainer.cs index b50b9a890..6d3e9037b 100644 --- a/src/client/spark/Modules/Trading/Ladder/VM/LadderVMContainer.cs +++ b/src/client/spark/Modules/Trading/Ladder/VM/LadderVMContainer.cs @@ -46,12 +46,12 @@ namespace mbts.spark { void _reset_ladder_vm() { if (_value == null && !_security_md.HasValue) return; - Disposable.replace(ref _value, - _security_md.HasValue ? - LadderVM.create_readonly(_bus, - new LadderModel(security_md.Value, _model, _model.mbo_service, - new Func(osec => _selected_order_tree.Contains(osec.order.Key))), - Observable.Return(LadderSettings.sanitize(LadderSettings.Default))) : null); + _value?.Dispose(); + _value = _security_md.HasValue ? + LadderVM.create_readonly(_bus, + new LadderModel(security_md.Value, _model, _model.mbo_service, + new Func(osec => _selected_order_tree.Contains(osec.order.Key))), + Observable.Return(LadderSettings.sanitize(LadderSettings.Default))) : null; RaisePropertyChanged(nameof(value)); } }