From 7a4c5428ea08305b3b0ca0685f83cb2bc02e6e2b Mon Sep 17 00:00:00 2001 From: Christian Hornung Date: Fri, 6 Oct 2006 15:45:56 +0000 Subject: [PATCH] Fixed SD2-1068: #D can't open resx files if these have resources of type System.Resources.ResXNullRef git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@1886 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61 --- .../Project/Src/ResourceEdit/ResourceItem.cs | 7 +++++++ .../Project/Src/ResourceEdit/ResourceList.cs | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/AddIns/DisplayBindings/ResourceEditor/Project/Src/ResourceEdit/ResourceItem.cs b/src/AddIns/DisplayBindings/ResourceEditor/Project/Src/ResourceEdit/ResourceItem.cs index 83742d878c..1ce163bd9f 100644 --- a/src/AddIns/DisplayBindings/ResourceEditor/Project/Src/ResourceEdit/ResourceItem.cs +++ b/src/AddIns/DisplayBindings/ResourceEditor/Project/Src/ResourceEdit/ResourceItem.cs @@ -46,6 +46,9 @@ namespace ResourceEditor public int ImageIndex { get { + if (this.resourceValue == null) { + return -1; + } switch(this.resourceValue.GetType().ToString()) { case "System.String": return 0; @@ -65,6 +68,10 @@ namespace ResourceEditor public override string ToString() { + if (ResourceValue == null) { + return "(Nothing/null)"; + } + string type = ResourceValue.GetType().FullName; string tmp = String.Empty; diff --git a/src/AddIns/DisplayBindings/ResourceEditor/Project/Src/ResourceEdit/ResourceList.cs b/src/AddIns/DisplayBindings/ResourceEditor/Project/Src/ResourceEdit/ResourceList.cs index 155eba834b..526df584ad 100644 --- a/src/AddIns/DisplayBindings/ResourceEditor/Project/Src/ResourceEdit/ResourceList.cs +++ b/src/AddIns/DisplayBindings/ResourceEditor/Project/Src/ResourceEdit/ResourceList.cs @@ -219,7 +219,7 @@ namespace ResourceEditor ResourceItem item = entry.Value; string tmp = item.ToString(); - string type = item.ResourceValue.GetType().FullName; + string type = item.ResourceValue == null ? "(Nothing/null)" : item.ResourceValue.GetType().FullName; ListViewItem lv = new ListViewItem(new String[] {item.Name, type, tmp}, item.ImageIndex); Items.Add(lv);