--- trunk/RomCheater.RVACalculator/RVACalculatorPlugin.cs	2013/06/17 08:33:06	683
+++ trunk/RomCheater.RVACalculator/RVACalculatorPlugin.cs	2013/06/18 11:27:53	717
@@ -24,9 +24,10 @@ namespace RomCheater.RVACalculator
 {
     public class RVACalculatorPlugin : UserControlPlugin
     {
+        private RVACalculatorDockControl t;
         const string name = "RVA Calculator Plugin";
         const string description = "A simple plugin to help calculate RVA values";
-        public RVACalculatorPlugin() : base() { }
+        public RVACalculatorPlugin() : base() { t = new RVACalculatorDockControl(this); }
         public override Guid ID
         {
             get { return AssemblyGuid.GetGuid(typeof(RVACalculatorPlugin)); }
@@ -60,8 +61,7 @@ namespace RomCheater.RVACalculator
         public override void Show(DockPanel dockPanel, DockState dockState) { InternalShow(dockPanel, dockState); }
         private void InternalShow(DockPanel dockPanel, DockState dockState)
         {
-#if PLUGIN_ENABLED
-            var t = new RVACalculatorDockControl(this);
+#if PLUGIN_ENABLED            
             if (dockPanel == null)
             {
                 t.Show();
@@ -74,5 +74,26 @@ namespace RomCheater.RVACalculator
             Logging.logger.Warn.WriteLine("Plugin: '{0}' guid: '{1}' - is currently disabled", name, ID);
 #endif
         }
+
+        public override void Activate()
+        {
+            DockContentHandler handler = this.DockHandler;
+            if (handler != null)
+                handler.Activate();
+        }
+        public override void Close()
+        {
+            DockContentHandler handler = this.DockHandler;
+            if (handler != null)
+                handler.Close();
+        }
+        public override DockContentHandler DockHandler
+        {
+            get
+            {
+                if (t == null || t.DockHandler == null) return null;
+                return t.DockHandler;
+            }
+        }
     }
 }