Skip to content

Commit f15a477

Browse files
committed
Automatic merge of T1.5.1-799-gb02a6e5d3 and 14 pull requests
- Pull request #570 at 3539862: Experimental glTF 2.0 support with PBR lighting - Pull request #839 at d00beb9: First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters - Pull request #876 at f92de76: docs: add source for documents previously on website to source Documentation folder - Pull request #882 at a055bca: Blueprint/train car operations UI window - Pull request #885 at 8f94333: feat: Add notifications to Menu - Pull request #886 at 6c0785b: Scene viewer extension to TrackViewer - Pull request #892 at 1f5ba4c: Signal Function OPP_SIG_ID_TRAINPATH - Pull request #896 at 5866028: First implementation of https://blueprints.launchpad.net/or/+spec/specific-sounds-for-ai-trains - Pull request #897 at 42f1dd9: feat: Improved system information collection - Pull request #899 at b227eec: Duplex steam engines - Booster Engine addition - Pull request #903 at 0d6d045: Downloading route content (Github, zip) - Pull request #907 at 9b0b04f: Bug fix for https://bugs.launchpad.net/or/+bug/2047300 Dynamic tracks disappear after long tunnel - Pull request #908 at 4b4afe3: feat: supports switching adhesion precisions - Pull request #911 at 6834af0: docs: Add refactoring as a special type of PR
16 parents 5de4f9f + b02a6e5 + 3539862 + d00beb9 + f92de76 + a055bca + 8f94333 + 6c0785b + 1f5ba4c + 5866028 + 42f1dd9 + b227eec + 0d6d045 + 9b0b04f + 4b4afe3 + 6834af0 commit f15a477

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

Source/Menu/DownloadContentForm.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -759,6 +759,8 @@ void StartButton_Click(object sender, EventArgs e)
759759
mainForm.comboBoxRoute.SelectedIndex = determineSelectedIndex(mainForm.comboBoxRoute, route.Start.Route);
760760

761761
mainForm.radioButtonModeActivity.Checked = true;
762+
763+
mainForm.LoadActivityList();
762764
// hardcoded: + Explore in Activity Mode +
763765
mainForm.comboBoxActivity.SelectedIndex = 1;
764766

Source/Menu/MainForm.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -781,7 +781,6 @@ public void LoadFolderList()
781781
switch (form.ShowDialog(this))
782782
{
783783
case DialogResult.OK:
784-
LoadFolderList();
785784
break;
786785
case DialogResult.Retry:
787786
RestartMenu();

Source/ORTS.Settings/ContentSettings.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public class ContentSettings : SettingsBase
2727
{
2828
#region User Settings
2929

30-
[Default("C:\\OpenRails")]
30+
[Default("C:\\OpenRailsRoutes")]
3131
public string InstallPath { get; set; }
3232

3333
#endregion

0 commit comments

Comments
 (0)