From bc3531bebb28759d4abfc3baca427e15171ab97f Mon Sep 17 00:00:00 2001
From: Sentinel209_cp <5b554accd9e292fcb886b205d8d4c32c5d52ce2df5Ng6vpx>
Date: Mon, 4 Jul 2011 23:42:49 +0000
Subject: [PATCH]

---
 .../Cosmos.VS.WindowsPackage.cs               | 35 +++++++++++++++
 source2/VSIP/Cosmos.VS.Windows/PipeThread.cs  | 43 -------------------
 2 files changed, 35 insertions(+), 43 deletions(-)

diff --git a/source2/VSIP/Cosmos.VS.Windows/Cosmos.VS.WindowsPackage.cs b/source2/VSIP/Cosmos.VS.Windows/Cosmos.VS.WindowsPackage.cs
index c7008695a..527733a4b 100644
--- a/source2/VSIP/Cosmos.VS.Windows/Cosmos.VS.WindowsPackage.cs
+++ b/source2/VSIP/Cosmos.VS.Windows/Cosmos.VS.WindowsPackage.cs
@@ -50,6 +50,9 @@ namespace Cosmos.Cosmos_VS_Windows
         /// initialization is the Initialize method.
         public Cosmos_VS_WindowsPackage()
         {
+            PipeThread.DataPacketReceived += new Action<byte, byte[]>(PipeThread_DataPacketReceived);
+            var xServerThread = new Thread(PipeThread.ThreadStartServer);
+            xServerThread.Start();
             Trace.WriteLine(string.Format(CultureInfo.CurrentCulture, "Entering constructor for: {0}", this.ToString()));
         }
 
@@ -128,5 +131,37 @@ namespace Cosmos.Cosmos_VS_Windows
             }
         }
 
+        void PipeThread_DataPacketReceived(byte aCmd, byte[] aMsg)
+        {
+            switch (aCmd)
+            {
+                case DwMsgType.Noop:
+                    break;
+
+                case DwMsgType.Stack:
+                    break;
+
+                case DwMsgType.Frame:
+                    break;
+
+                case DwMsgType.Registers:
+                    RegistersTW.mUC.Dispatcher.Invoke(DispatcherPriority.Normal, (Action)delegate()
+                    {
+                        RegistersTW.mUC.Update(aMsg);
+                    });
+                    break;
+
+                case DwMsgType.Quit:
+                    //Close();
+                    break;
+
+                case DwMsgType.AssemblySource:
+                    AssemblyTW.mUC.Dispatcher.Invoke(DispatcherPriority.Normal, (Action)delegate()
+                    {
+                        AssemblyTW.mUC.Update(aMsg);
+                    });
+                    break;
+            }
+        }
     }
 }
diff --git a/source2/VSIP/Cosmos.VS.Windows/PipeThread.cs b/source2/VSIP/Cosmos.VS.Windows/PipeThread.cs
index 253916a9a..c70acf85e 100644
--- a/source2/VSIP/Cosmos.VS.Windows/PipeThread.cs
+++ b/source2/VSIP/Cosmos.VS.Windows/PipeThread.cs
@@ -93,47 +93,4 @@ namespace Cosmos.VS.Debug
             }
         }
     }
-
-    class PipeCallback
-    {
-        static public void InitPipe()
-        {
-            PipeThread.DataPacketReceived += new Action<byte, byte[]>(PipeThread_DataPacketReceived);
-            var xServerThread = new Thread(PipeThread.ThreadStartServer);
-            xServerThread.Start();
-        }
-
-        static void PipeThread_DataPacketReceived(byte aCmd, byte[] aMsg)
-        {
-            switch (aCmd)
-            {
-                case DwMsgType.Noop:
-                    break;
-
-                case DwMsgType.Stack:
-                    break;
-
-                case DwMsgType.Frame:
-                    break;
-
-                case DwMsgType.Registers:
-                    RegistersTW.mUC.Dispatcher.Invoke(DispatcherPriority.Normal, (Action)delegate()
-                    {
-                        RegistersTW.mUC.Update(aMsg);
-                    });
-                    break;
-
-                case DwMsgType.Quit:
-                    //Close();
-                    break;
-
-                case DwMsgType.AssemblySource:
-                    AssemblyTW.mUC.Dispatcher.Invoke(DispatcherPriority.Normal, (Action)delegate()
-                    {
-                        AssemblyTW.mUC.Update(aMsg);
-                    });
-                    break;
-            }
-        }
-    }
 }