← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/monodevelop/oneiric

« back to all changes in this revision

Viewing changes to src/addins/MonoDevelop.GtkCore/libsteticui/AssemblyWidgetLibrary.cs

  • Committer: Bazaar Package Importer
  • Author(s): Jo Shields
  • Date: 2011-06-27 17:03:13 UTC
  • mto: (1.8.1 upstream)
  • mto: This revision was merged to the branch mainline in revision 54.
  • Revision ID: james.westby@ubuntu.com-20110627170313-6cvz3s19x6e9hqe9
Import upstream version 2.5.92+dfsg

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/addins/MonoDevelop.GtkCore/libsteticui/AssemblyWidgetLibrary.cs
117
117
                                }
118
118
                                
119
119
                                if (depasm == null) {
120
 
                                        string file = resolver.Resolve (aname.FullName, Path.GetDirectoryName (asm.Location));
 
120
                                        string file = resolver != null ? resolver.Resolve (aname.FullName, Path.GetDirectoryName (asm.Location)) : null;
121
121
                                        if (file != null)
122
122
                                                depasm = Assembly.LoadFrom (file);
123
123
                                        else