mirror of
https://github.com/Ryujinx/GtkSharp.git
synced 2024-09-16 11:34:47 +02:00
2008-09-12 Zoltan Varga <vargaz@gmail.com>
* glib/GType.cs (FindTypeInReferences): Put a try-catch around the assembly loading as failure to load a referenced assembly is not really an error. svn path=/trunk/gtk-sharp/; revision=112905
This commit is contained in:
parent
cbf6068edf
commit
fc871aacca
@ -1,3 +1,8 @@
|
|||||||
|
2008-09-12 Zoltan Varga <vargaz@gmail.com>
|
||||||
|
|
||||||
|
* glib/GType.cs (FindTypeInReferences): Put a try-catch around the assembly
|
||||||
|
loading as failure to load a referenced assembly is not really an error.
|
||||||
|
|
||||||
2008-09-12 Mike Gorse <mgorse@novell.com>
|
2008-09-12 Mike Gorse <mgorse@novell.com>
|
||||||
|
|
||||||
* atk/Object.custom, atk/glue/object.c: Support GetIndexInParent.
|
* atk/Object.custom, atk/glue/object.c: Support GetIndexInParent.
|
||||||
|
@ -166,13 +166,17 @@ namespace GLib {
|
|||||||
string asm_dir = Path.GetDirectoryName (asm.Location);
|
string asm_dir = Path.GetDirectoryName (asm.Location);
|
||||||
foreach (AssemblyName ref_name in asm.GetReferencedAssemblies ()) {
|
foreach (AssemblyName ref_name in asm.GetReferencedAssemblies ()) {
|
||||||
Assembly ref_asm;
|
Assembly ref_asm;
|
||||||
if (File.Exists (Path.Combine (asm_dir, ref_name.Name + ".dll")))
|
try {
|
||||||
ref_asm = Assembly.LoadFrom (Path.Combine (asm_dir, ref_name.Name + ".dll"));
|
if (File.Exists (Path.Combine (asm_dir, ref_name.Name + ".dll")))
|
||||||
else
|
ref_asm = Assembly.LoadFrom (Path.Combine (asm_dir, ref_name.Name + ".dll"));
|
||||||
ref_asm = Assembly.Load (ref_name);
|
else
|
||||||
result = FindTypeInReferences (type_name, ref_asm, visited);
|
ref_asm = Assembly.Load (ref_name);
|
||||||
if (result != null)
|
result = FindTypeInReferences (type_name, ref_asm, visited);
|
||||||
break;
|
if (result != null)
|
||||||
|
break;
|
||||||
|
} catch (Exception) {
|
||||||
|
/* Failure to load a referenced assembly is not an error */
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
|
Loading…
Reference in New Issue
Block a user