ryujinx/Opentk
1
0
Fork 0
mirror of https://github.com/Ryujinx/Opentk.git synced 2025-04-17 14:51:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

[X11] GetEntryAssembly may be null.

Browse source 
When running under NUnit GetEntryAssembly returns null. In this case we instead
search through the AppDomain for an assembly that matches the AppDomain name.
This commit is contained in:
Fraser Waters 2014-11-04 23:00:05 +01:00
parent f8af961d54
commit b9cc6fa861
1 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
Source/OpenTK/Platform/X11/X11GLNative.cs
View file

@ -194,8 +194,25 @@ namespace OpenTK.Platform.X11
hints.flags = (IntPtr)(XSizeHintsFlags.PSize | XSizeHintsFlags.PPosition);
XClassHint class_hint = new XClassHint();
class_hint.Name = Assembly.GetEntryAssembly().GetName().Name.ToLower();
class_hint.Class = Assembly.GetEntryAssembly().GetName().Name;
var entry_assembly = Assembly.GetEntryAssembly();
// May not have an entry assembly, try to find a "matching" assembly in the AppDomain
if (entry_assembly == null)
{
foreach (var assembly in AppDomain.CurrentDomain.GetAssemblies())
{
if (AppDomain.CurrentDomain.FriendlyName.EndsWith(assembly.ManifestModule.Name))
{
if (entry_assembly == null || assembly.ManifestModule.Name.Length > entry_assembly.ManifestModule.Name.Length)
{
entry_assembly = assembly;
}
}
}
}
var name = entry_assembly.GetName().Name;
class_hint.Class = name;
class_hint.Name = name.ToLower();
using (new XLock(window.Display))
{