From 26dfd89d6cd24ebf462740e90e59ab2c211c8b07 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Wed, 23 Jan 2019 10:07:07 -0600 Subject: [PATCH] Properly Dispose of the OrderBookVM when the popup closes --- src/client/spark/view/Spark/Ladder/LadderOrdersHost.cs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/client/spark/view/Spark/Ladder/LadderOrdersHost.cs b/src/client/spark/view/Spark/Ladder/LadderOrdersHost.cs index d14cd4e1a..018509e19 100644 --- a/src/client/spark/view/Spark/Ladder/LadderOrdersHost.cs +++ b/src/client/spark/view/Spark/Ladder/LadderOrdersHost.cs @@ -128,17 +128,22 @@ namespace mbts.spark { var curr_order = b.DataContext as LadderOrderVM; if (e.ChangedButton == MouseButton.Middle) { // create the new popup window in here - - var view = new MiniOrderBookView(order.orderbook_vm); + var obvm = order.orderbook_vm; + var view = new MiniOrderBookView(obvm); var popup = new System.Windows.Controls.Primitives.Popup(); + // we only keep the obvm around assigned to the DataContext so that we can + // properly Dispose of it later when the popup is closed. + popup.DataContext = obvm; popup.Child = view; popup.StaysOpen = false; popup.PlacementTarget = popup_placement_target; popup.Placement = System.Windows.Controls.Primitives.PlacementMode.Bottom; popup.VerticalOffset = 5; popup.IsOpen = true; + popup.Closed += (sender, event_args) => (popup.DataContext as IDisposable)?.Dispose(); b.Popup = popup; + // close context menu after command executed //if (curr_order != null) { // Action command_executed = null;