Skip to content

Commit 2ecd06b

Browse files
committed
Automatic merge of T1.5.1-1145-g814391ecb8 and 18 pull requests
- Pull request #891 at 9a1d6b2: Auto save - Pull request #959 at 2452cb0: Fix TrackViewer crash on big zoom value - Pull request #972 at e90a2aa: On Map window color changed switch or signal is not changed - Pull request #839 at d00beb9: First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters - Pull request #882 at 8f695a4: Blueprint/train car operations UI window - Pull request #892 at 1f5ba4c: Signal Function OPP_SIG_ID_TRAINPATH - Pull request #953 at a519452: Fix Lights Crash on Corrupt Shapes - Pull request #954 at 53e9cc6: Multiple Track Profiles & Superelevation Improvements - Pull request #962 at 46d0472: Fix pantographs on unpowered cars - Pull request #970 at 6fa5eed: feat: Remove unnecessary Windows.Forms usage - Pull request #973 at c35be87: fix: Using singular target framework to allow for different platforms across different projects - Pull request #974 at 5faea6f: Bug fix for https://bugs.launchpad.net/or/+bug/2076034 Doors remain open in AI trains - Pull request #977 at a30c659: adds cache for SD files - Pull request #978 at 91f3ee8: fix: adds MilepostUnitsMiles to Manual - Pull request #900 at c27f32d: DMI updates - Pull request #799 at dfc715e: Consolidated wind simulation - Pull request #876 at f92de76: docs: add source for documents previously on website to source Documentation folder - Pull request #952 at 8347095: Investigation - Pulsing graphics
20 parents 529e648 + 814391e + 9a1d6b2 + 2452cb0 + e90a2aa + d00beb9 + 8f695a4 + 1f5ba4c + a519452 + 53e9cc6 + 46d0472 + 6fa5eed + c35be87 + 5faea6f + a30c659 + 91f3ee8 + c27f32d + dfc715e + f92de76 + 8347095 commit 2ecd06b

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

Source/Menu/MainForm.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -575,7 +575,7 @@ void buttonOptions_Click(object sender, EventArgs e)
575575
}
576576
}
577577
}
578-
578+
579579
void buttonDownloadContent_Click(object sender, EventArgs e)
580580
{
581581
using (var form = new DownloadContentForm(Settings))
@@ -1356,9 +1356,9 @@ void UpdateFromMenuSelection<T>(ComboBox comboBox, UserSettings.Menu_SelectionIn
13561356
if (comboBox.DropDownStyle == ComboBoxStyle.DropDown)
13571357
{
13581358
comboBox.Text = Settings.Menu_Selection[(int)index];
1359-
}
1360-
else
1361-
{
1359+
}
1360+
else
1361+
{
13621362
SelectComboBoxItem<T>(comboBox, item => map(item) == Settings.Menu_Selection[(int)index]);
13631363
}
13641364
}
@@ -1405,7 +1405,7 @@ void UpdateFromMenuSelection<T>(ComboBox comboBox, UserSettings.Menu_SelectionIn
14051405
if ((index != UserSettings.Menu_SelectionIndex.Path) ||
14061406
(SelectedActivity == null) || (!(SelectedActivity is ExploreActivity)))
14071407
{
1408-
if (comboBox.DropDownStyle == ComboBoxStyle.DropDown)
1408+
if (comboBox.DropDownStyle == ComboBoxStyle.DropDown)
14091409
{
14101410
comboBox.Text = valueComboboxToSetTo;
14111411
found = true;
@@ -1424,9 +1424,9 @@ void UpdateFromMenuSelection<T>(ComboBox comboBox, UserSettings.Menu_SelectionIn
14241424
{
14251425
if (comboBox.Items.Count > 0)
14261426
{
1427-
comboBox.SelectedIndex = 0;
1428-
}
1429-
}
1427+
comboBox.SelectedIndex = 0;
1428+
}
1429+
}
14301430
}
14311431
else
14321432
{

0 commit comments

Comments
 (0)