Working on PPC Machine Studio External Bridge !

2 files changed, 19 insertions, 1 deletions

diff --git a/Software/Visual_Studio/Tango.Core/DI/TangoCreateWhenRegisteredAttribute.cs b/Software/Visual_Studio/Tango.Core/DI/TangoCreateWhenRegisteredAttribute.cs
new file mode 100644
index 000000000..572c9f413
--- /dev/null
+++ b/Software/Visual_Studio/Tango.Core/DI/TangoCreateWhenRegisteredAttribute.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tango.Core.DI
+{
+    [AttributeUsage(AttributeTargets.Class)]
+    public class TangoCreateWhenRegisteredAttribute : Attribute
+    {
+    }
+}
diff --git a/Software/Visual_Studio/Tango.Core/DI/TangoIOC.cs b/Software/Visual_Studio/Tango.Core/DI/TangoIOC.cs
index 50b892552..de42ac6e7 100644
--- a/Software/Visual_Studio/Tango.Core/DI/TangoIOC.cs
+++ b/Software/Visual_Studio/Tango.Core/DI/TangoIOC.cs
@@ -280,6 +280,11 @@ namespace Tango.Core.DI
             var registeredType = new RegisteredType(interfaceType, implementationType, instance);
             _registeredTypes.Add(interfaceType, registeredType);
 
+            if (implementationType.GetCustomAttribute<TangoCreateWhenRegisteredAttribute>() != null && instance == null)
+            {
+                instance = GetInstance(interfaceType);
+            }
+
             if (registeredType.Instance != null)
             {
                 NotifyAwaitingRetrievals(registeredType);
@@ -363,7 +368,7 @@ namespace Tango.Core.DI
                 }
                 else
                 {
-                    GetInstanceWhenAvailable(prop.PropertyType, (x) => 
+                    GetInstanceWhenAvailable(prop.PropertyType, (x) =>
                     {
                         prop.SetValue(target, GetInstance(prop.PropertyType));
                     });