aboutsummaryrefslogtreecommitdiff
path: root/ShiftOS_TheReturn
diff options
context:
space:
mode:
authorMichael <[email protected]>2017-02-02 11:25:17 -0500
committerMichael <[email protected]>2017-02-02 11:25:17 -0500
commite55e195d88ba4a3bfea47cb8784564a43f426e48 (patch)
treedb44c24ccdfccc14136ca43da2701a94b450f407 /ShiftOS_TheReturn
parentfbc1586ff2e1362ce53952f65d78eb015efbcb04 (diff)
downloadshiftos_thereturn-e55e195d88ba4a3bfea47cb8784564a43f426e48.tar.gz
shiftos_thereturn-e55e195d88ba4a3bfea47cb8784564a43f426e48.tar.bz2
shiftos_thereturn-e55e195d88ba4a3bfea47cb8784564a43f426e48.zip
make app launcher prober ignore blocked DLLs
Diffstat (limited to 'ShiftOS_TheReturn')
-rw-r--r--ShiftOS_TheReturn/AppLauncherDaemon.cs13
1 files changed, 10 insertions, 3 deletions
diff --git a/ShiftOS_TheReturn/AppLauncherDaemon.cs b/ShiftOS_TheReturn/AppLauncherDaemon.cs
index 6df2f41..9a0754b 100644
--- a/ShiftOS_TheReturn/AppLauncherDaemon.cs
+++ b/ShiftOS_TheReturn/AppLauncherDaemon.cs
@@ -53,10 +53,12 @@ namespace ShiftOS.Engine
{
if (asmExec.EndsWith(".dll") | asmExec.EndsWith(".exe"))
{
- var asm = Assembly.LoadFrom(asmExec);
-
- if (asm.GetReferencedAssemblies().Contains("ShiftOS.Engine") || asm.FullName.Contains("ShiftOS.Engine"))
+ try
{
+ var asm = Assembly.LoadFrom(asmExec);
+
+ if (asm.GetReferencedAssemblies().Contains("ShiftOS.Engine") || asm.FullName.Contains("ShiftOS.Engine"))
+ {
foreach (var type in asm.GetTypes())
{
if (type.GetInterfaces().Contains(typeof(IShiftOSWindow)))
@@ -74,6 +76,11 @@ namespace ShiftOS.Engine
}
}
}
+ }
+ }
+ catch
+ {
+
}
}
}