Merged in GZDB r2475.

This commit is contained in:
MascaraSnake 2016-01-23 09:31:26 +01:00
parent 5cf574f42d
commit b604dfc4af
3 changed files with 6 additions and 3 deletions

View file

@ -359,7 +359,7 @@ namespace CodeImp.DoomBuilder.Controls
// Select this // Select this
if(n.TreeView != null) //mxd. Tree node may've been removed during filtering if(n.TreeView != null) //mxd. Tree node may've been removed during filtering
{ {
n.Parent.Expand(); if (n.Parent != null) n.Parent.Expand(); // node won't have parent when the list is prefiltered
typelist.SelectedNodes.Add(n); typelist.SelectedNodes.Add(n);
n.EnsureVisible(); n.EnsureVisible();
break; break;

Binary file not shown.

View file

@ -485,6 +485,9 @@ namespace CodeImp.DoomBuilder.ZDoom
protected void SkipStructure() { SkipStructure(new HashSet<string>()); } protected void SkipStructure() { SkipStructure(new HashSet<string>()); }
protected void SkipStructure(HashSet<string> breakat) protected void SkipStructure(HashSet<string> breakat)
{ {
// We need it to be case-insensitive
if (breakat.Count > 0) breakat = new HashSet<string>(breakat, StringComparer.OrdinalIgnoreCase);
string token; string token;
do do
{ {