2009-10-30 Mike Kestner <mkestner@novell.com>

* glib/GType.cs: avoid another exception on bogus assm.Locations.
	  [Fixes #546045]

svn path=/trunk/gtk-sharp/; revision=145132
This commit is contained in:
Mike Kestner 2009-10-31 02:18:21 +00:00
parent df7e0afe5c
commit 95bd0d6271
2 changed files with 6 additions and 1 deletions

View File

@ -1,3 +1,8 @@
2009-10-30 Mike Kestner <mkestner@novell.com>
* glib/GType.cs: avoid another exception on bogus assm.Locations.
[Fixes #546045]
2009-09-24 Christian Hoff <christian_hoff@gmx.net>
* gtk/Widget.custom: Use Glib.Value's GType.Long support.

View File

@ -230,8 +230,8 @@ namespace GLib {
foreach (AssemblyName ref_name in asm.GetReferencedAssemblies ()) {
if (ref_name.Name != asm_name)
continue;
string asm_dir = Path.GetDirectoryName (asm.Location);
try {
string asm_dir = Path.GetDirectoryName (asm.Location);
Assembly ref_asm;
if (File.Exists (Path.Combine (asm_dir, ref_name.Name + ".dll")))
ref_asm = Assembly.LoadFrom (Path.Combine (asm_dir, ref_name.Name + ".dll"));