Skip to content

Commit c651d35

Browse files
committed
Automatic merge of T1.6-rc6-37-g6dd094783 and 15 pull requests
- Pull request #1086 at e10390b: Add Settings Exporter tool (copy settings to INI, etc) - Pull request #1104 at 86d38a2: Handle simple adhesion within the axle module - Pull request #1115 at 270f22f: Do not activate ETS switch if no suitable cars are attached - Pull request #1120 at ba3c47f: Automatically Calculate Friction Values if Missing - Pull request #1121 at 91d2d26: Manually Override Articulation - Pull request #1130 at 8ae6bb7: Fix F9 points to an incorrect car ID. - Pull request #1139 at 03c6f8f: Fix for bug https://bugs.launchpad.net/or/+bug/2117357. - Pull request #1142 at a24747c: Fix Light Position Calculation for Deeper Hierarchy Levels - Pull request #1143 at 71e57d2: Status in Work Orders popup set too fast - Pull request #1144 at cd790b9: update Spanish translations - Pull request #1145 at 875b084: Content Manager: Fix exception when searching; path was added twice to search list. - Pull request #1082 at 5845a1a: Allow variable water level in glass gauge - Pull request #1081 at 689494b: Brake cuts power unification - Pull request #1124 at fab5457: Built-in PBL2 brake controller - Pull request #1128 at 58de4c3: Particle Emitter Overhaul
17 parents ffdf5e8 + 6dd0947 + e10390b + 86d38a2 + 270f22f + ba3c47f + 91d2d26 + 8ae6bb7 + 03c6f8f + a24747c + 71e57d2 + cd790b9 + 875b084 + 5845a1a + 689494b + fab5457 + 58de4c3 commit c651d35

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

Source/Contrib/ContentManager/ContentManagerGUI.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,8 @@ void searchBox_TextChanged(object sender, EventArgs e)
286286
finds.Add(new SearchResult(content, path));
287287

288288
foreach (var child in ((ContentType[])Enum.GetValues(typeof(ContentType))).SelectMany(ct => content.Get(ct)))
289-
pending.Add(path + " / " + child.Name, child);
289+
if (!pending.ContainsKey(path + " / " + child.Name))
290+
pending.Add(path + " / " + child.Name, child);
290291

291292
foreach (var child in ContentLink.Matches(ContentInfo.GetText(content)).Cast<Match>().Select(linkMatch => content.Get(linkMatch.Groups[1].Value, (ContentType)Enum.Parse(typeof(ContentType), linkMatch.Groups[2].Value))).Where(linkContent => linkContent != null))
292293
if (!pending.ContainsKey(path + " -> " + child.Name))

0 commit comments

Comments
 (0)