Merge pull request tradingtechnologies#2 from tradingtechnologies/feature/DEB-22310

 Fixed OrderFilter Sample

Author: JoshBramlett

CodeSamples_TTAPI_CSharp.suo

@@ -247,12 +247,6 @@ void instrRequest_Completed(object sender, InstrumentLookupSubscriptionEventArgs
                     this.txtProductType.Text = e.Instrument.Product.Type.ToString();
                     this.txtContract.Text = e.Instrument.GetFormattedName(InstrumentNameFormat.User);
 
-                    if (m_instrumentTradeSubscription != null)
-                    {
-                        m_instrumentTradeSubscription.Dispose();
-                        m_instrumentTradeSubscription = null;
-                    }
-
                     // populate the order feed dropdown
                     this.cboOrderFeed.Items.Clear();
                     foreach (OrderFeed orderFeed in e.Instrument.GetValidOrderFeeds())
@@ -261,9 +255,7 @@ void instrRequest_Completed(object sender, InstrumentLookupSubscriptionEventArgs
                     this.cboOrderFeed.SelectedIndex = 0;
 
                     // This sample will monitor new orders and deleting working orders
-                    m_instrumentTradeSubscription = new InstrumentTradeSubscription(m_TTAPI.Session, Dispatcher.Current, e.Instrument);
-                    m_instrumentTradeSubscription.OrderAdded += new EventHandler<OrderAddedEventArgs>(instrumentTradeSubscription_OrderAdded);
-                    m_instrumentTradeSubscription.OrderDeleted += new EventHandler<OrderDeletedEventArgs>(instrumentTradeSubscription_OrderDeleted);
+                    CreateInstrumentTradeSubscription(e.Instrument);
                     m_instrumentTradeSubscription.Start();
                 }
                 catch (Exception err)
@@ -281,6 +273,19 @@ void instrRequest_Completed(object sender, InstrumentLookupSubscriptionEventArgs
             }
         }
 
+        private void CreateInstrumentTradeSubscription(Instrument instrument)
+        {
+            if (m_instrumentTradeSubscription != null)
+            {
+                m_instrumentTradeSubscription.Dispose();
+                m_instrumentTradeSubscription = null;
+            }
+
+            m_instrumentTradeSubscription = new InstrumentTradeSubscription(m_TTAPI.Session, Dispatcher.Current, instrument);
+            m_instrumentTradeSubscription.OrderAdded += new EventHandler<OrderAddedEventArgs>(instrumentTradeSubscription_OrderAdded);
+            m_instrumentTradeSubscription.OrderDeleted += new EventHandler<OrderDeletedEventArgs>(instrumentTradeSubscription_OrderDeleted);
+        }
+
         #endregion
 
         #region InstrumentTradeSubscription Updates
@@ -393,6 +398,8 @@ private void btnApplyOrderFilter_Click(object sender, EventArgs e)
             if (m_instrumentTradeSubscription == null)
                 return;
 
+            CreateInstrumentTradeSubscription(m_instrumentTradeSubscription.Instrument);
+
             // no filter to set, return
             if (this.cboFilter1.SelectedIndex < 0)
                 return;