Skip to content

Commit 5161096

Browse files
committed
Automatic merge of T1.5.1-1711-g44e59199a and 17 pull requests
- Pull request #570 at f11a428: glTF 2.0 support with PBR lighting - Pull request #900 at 4629736: DMI in 3D cab + two more dials - Pull request #1030 at d3ae4a2: Refactor settings, in prep for settings exporter - Pull request #1052 at 3b5cb90: Content Manager: Add axle count, and lowest derail force - Pull request #1062 at b96d6fa: Train Forces popup Window. - Pull request #1064 at 52410f9: Add Train Info tab to Help window (F1) - Pull request #1066 at 62c89c1: Log derailment, using TraceInformation. - Pull request #892 at 1f5ba4c: Signal Function OPP_SIG_ID_TRAINPATH - Pull request #1000 at d8d9709: Locomotive operation from control car - Pull request #1049 at 6a0c471: Re-organise document storage and access - Pull request #1057 at 254b6d4: Switchable brake system - Pull request #1069 at 3f153f0: Mouse wheel control only with Alt – Followup for #1051 - Pull request #1070 at f818e40: Fix a NullReferenceException in TCS scripts - Pull request #1071 at 722dd3f: Change cover image for v1.6 - Pull request #1074 at e9a66c1: Gradient - commit 2024-16-12 - Pull request #1076 at d1ff8fd: Allow depart early - Pull request #1055 at 5c78967: Route Based TTrack Sounds
19 parents bb78fd6 + 44e5919 + f11a428 + 4629736 + d3ae4a2 + 3b5cb90 + b96d6fa + 52410f9 + 62c89c1 + 1f5ba4c + d8d9709 + 6a0c471 + 254b6d4 + 3f153f0 + f818e40 + 722dd3f + e9a66c1 + d1ff8fd + 5c78967 commit 5161096

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

Source/Menu/MainForm.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1443,13 +1443,13 @@ void UpdateFromMenuSelection<T>(ComboBox comboBox, UserSettings.Menu_SelectionIn
14431443
}
14441444
else if (!string.IsNullOrEmpty(valueComboboxToSetTo))
14451445
{
1446-
if (comboBox.DropDownStyle == ComboBoxStyle.DropDown)
1446+
if (comboBox.DropDownStyle == ComboBoxStyle.DropDown)
14471447
comboBox.Text = valueComboboxToSetTo;
14481448
else
14491449
searchInComboBoxAndSet(comboBox, valueComboboxToSetTo);
1450-
}
1451-
else
1452-
{
1450+
}
1451+
else
1452+
{
14531453
SetToDefault(comboBox, index, map, defaultValue);
14541454
}
14551455
}

0 commit comments

Comments
 (0)