From 95bd0d627119cdd1d5b363179a4a9ad8f74ae08e Mon Sep 17 00:00:00 2001 From: Mike Kestner Date: Sat, 31 Oct 2009 02:18:21 +0000 Subject: [PATCH] 2009-10-30 Mike Kestner * glib/GType.cs: avoid another exception on bogus assm.Locations. [Fixes #546045] svn path=/trunk/gtk-sharp/; revision=145132 --- ChangeLog | 5 +++++ glib/GType.cs | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 46e68e7a3..9e46ff6c1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-10-30 Mike Kestner + + * glib/GType.cs: avoid another exception on bogus assm.Locations. + [Fixes #546045] + 2009-09-24 Christian Hoff * gtk/Widget.custom: Use Glib.Value's GType.Long support. diff --git a/glib/GType.cs b/glib/GType.cs index 07c4bb42c..e8e039fcf 100755 --- a/glib/GType.cs +++ b/glib/GType.cs @@ -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"));