Merge pull request #129 from RogueAI42/master

ReflectMan Saves The Day..............

1 files changed, 1 insertions, 20 deletions

diff --git a/ShiftOS_TheReturn/NotificationDaemon.cs b/ShiftOS_TheReturn/NotificationDaemon.cs
index 0725782..a532466 100644
--- a/ShiftOS_TheReturn/NotificationDaemon.cs
+++ b/ShiftOS_TheReturn/NotificationDaemon.cs
@@ -41,26 +41,7 @@ namespace ShiftOS.Engine
         /// <returns>An array of <see cref="Type"/>s containing the found objects.</returns>
         public static Type[] GetAllStatusIcons()
         {
-            List<Type> lst = new List<Type>();
-            foreach(var exec in System.IO.Directory.GetFiles(Environment.CurrentDirectory))
-            {
-                if(exec.ToLower().EndsWith(".exe") || exec.ToLower().EndsWith(".dll"))
-                {
-                    try
-                    {
-                        var asm = Assembly.LoadFile(exec);
-                        foreach(var type in asm.GetTypes().Where(x => x.GetInterfaces().Contains(typeof(IStatusIcon))))
-                        {
-                            if (Shiftorium.UpgradeAttributesUnlocked(type))
-                            {
-                                lst.Add(type);
-                            }
-                        }
-                    }
-                    catch { }
-                }
-            }
-            return lst.ToArray();
+            return Array.FindAll(ReflectMan.Types, x => x.GetInterfaces().Contains(typeof(IStatusIcon)) && Shiftorium.UpgradeAttributesUnlocked(x));
         }