From e691a26eee9e34f8ff736dcefc0f96ac6fb2e8ce Mon Sep 17 00:00:00 2001 From: John Colvin Date: Tue, 26 Mar 2019 16:04:44 -0500 Subject: [PATCH] OrderBookVM - 'fills_slave_predicate_src' accesses selected_rows on dispatcher thread --- .../spark/Modules/Trading/OrderBook/OrderBookVM.cs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs index c32c77d81..e3af86855 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs @@ -116,13 +116,13 @@ namespace mbts.spark { concat_disposable(settings_manager.subscribe_current().OnDispatcher().Subscribe(grid_settings_manager)); } IObservable> mk_fills_slave_predicate_src() => - selected_rows.ObserveSelf(true) - .BufferLatest(TimeSpan.FromSeconds(0.2)) - .Select(_ => mk_fills_slave_predicate()); - Func mk_fills_slave_predicate() { - var keys = new HashSet(selected_rows.SelectMany(r => new[] { r }.Concat(_row_collection.get_descendent_rows(r))).Select(r => r.order_key)); - return ft => keys.Contains(ft.fill.OrderKey); - } + Observable.Create>(o => { + return selected_rows.Observe().BufferLatest(TimeSpan.FromSeconds(0.2)).OnDispatcher().Subscribe(_ => { + var keys = new HashSet(selected_rows.SelectMany(r => new[] { r }.Concat(_row_collection.get_descendent_rows(r))).Select(r => r.order_key)); + o.OnNext(ft => keys.Contains(ft.fill.OrderKey)); + }); + }); + void on_filter_changed() => _row_collection.filter = _columns.get_filter(); void on_all_selected_orders_active_changed(bool newval) {