Browse Source

It seems that GetEntryAssembly might return null

pull/310/head
Nikita Tsukanov 11 years ago
parent
commit
6b30a6d6b2
  1. 4
      src/Skia/Perspex.Skia.Desktop/MethodTableImpl.cs

4
src/Skia/Perspex.Skia.Desktop/MethodTableImpl.cs

@ -79,9 +79,11 @@ namespace Perspex.Skia
foreach (
var basePath in
new[] {Assembly.GetEntryAssembly(), typeof (MethodTable).Assembly}.Select(
a => Path.GetDirectoryName(a.GetModules()[0].FullyQualifiedName))
a => Path.GetDirectoryName(a?.GetModules()?[0]?.FullyQualifiedName))
.Concat(new[] { Directory.GetCurrentDirectory()}))
{
if(basePath == null)
continue;
yield return Path.Combine(basePath);
yield return Path.Combine(basePath, "native");
yield return Path.Combine(basePath, "lib");

Loading…
Cancel
Save