diff options
| author | Mike Krüger <mkrueger@xamarin.com> | 2011-10-06 12:24:24 +0400 |
|---|---|---|
| committer | Mike Krüger <mkrueger@xamarin.com> | 2011-10-06 12:24:24 +0400 |
| commit | 2d25e49cf4f4abed4af5e1a5c87f276528a22219 (patch) | |
| tree | 3abe3ca75481e4dda7d90c9a4141d9483b9b682d /main/src/addins/MonoDevelop.AssemblyBrowser | |
| parent | 56205ada918f0817df21b6853c54caad3f110700 (diff) | |
| parent | d8e3f43e68df54e511c7c7c4dee89770f36c4883 (diff) | |
Merge branch 'master' into newresolver
Conflicts:
main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Dom/DomProperty.cs
Diffstat (limited to 'main/src/addins/MonoDevelop.AssemblyBrowser')
| -rw-r--r-- | main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs index 3dd776c7d3..8f77d3fb00 100644 --- a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs +++ b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs @@ -948,6 +948,8 @@ namespace MonoDevelop.AssemblyBrowser public void Open (string url) { ITreeNavigator nav = SearchMember (url); + if (definitions == null) // we've been disposed + return; if (nav == null) { foreach (var definition in definitions.ToArray ()) { foreach (var assemblyNameReference in definition.Value.Annotation<AssemblyDefinition> ().MainModule.AssemblyReferences) { |