From e213a2f2e87d7853e1385f6fb0d0ae4dae8b90e6 Mon Sep 17 00:00:00 2001
From: Roy Ben Shabat <Roy.mail.net@gmail.com>
Date: Thu, 20 Feb 2020 15:13:30 +0200
Subject: Fixed issues with ExtendedObject stackoverflow. Working on FSE...

---
 Software/Visual_Studio/Tango.Core/DI/TangoIOC.cs    | 2 +-
 Software/Visual_Studio/Tango.Core/ExtendedObject.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'Software/Visual_Studio/Tango.Core')

diff --git a/Software/Visual_Studio/Tango.Core/DI/TangoIOC.cs b/Software/Visual_Studio/Tango.Core/DI/TangoIOC.cs
index 0ab4f1969..dd3a9f0de 100644
--- a/Software/Visual_Studio/Tango.Core/DI/TangoIOC.cs
+++ b/Software/Visual_Studio/Tango.Core/DI/TangoIOC.cs
@@ -358,7 +358,7 @@ namespace Tango.Core.DI
         {
             var type = target.GetType();
 
-            foreach (var prop in type.GetPropertiesWithAttribute<TangoInjectAttribute>(BindingFlags.Public | BindingFlags.Instance))
+            foreach (var prop in type.GetPropertiesWithAttribute<TangoInjectAttribute>(BindingFlags.Public | BindingFlags.Instance | BindingFlags.NonPublic))
             {
                 var att = prop.GetCustomAttribute<TangoInjectAttribute>();
 
diff --git a/Software/Visual_Studio/Tango.Core/ExtendedObject.cs b/Software/Visual_Studio/Tango.Core/ExtendedObject.cs
index 1875dcd2d..acead4157 100644
--- a/Software/Visual_Studio/Tango.Core/ExtendedObject.cs
+++ b/Software/Visual_Studio/Tango.Core/ExtendedObject.cs
@@ -69,7 +69,7 @@ namespace Tango.Core
         /// <param name="propName">Name of the property.</param>
         protected virtual void RaisePropertyChangedAuto([CallerMemberName] string caller = null)
         {
-            RaisePropertyChanged(caller);
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(caller));
         }
 
         /// <summary>
-- 
cgit v1.3.1