Skip to content

Commit fabc315

Browse files
committed
Automatic merge of T1.5.1-1284-gca636331f4 and 13 pull requests
- Pull request #839 at d00beb9: First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters - Pull request #891 at 9a1d6b2: Auto save - Pull request #892 at 1f5ba4c: Signal Function OPP_SIG_ID_TRAINPATH - Pull request #952 at 8347095: Investigation - Pulsing graphics - Pull request #953 at a519452: Fix Lights Crash on Corrupt Shapes - Pull request #954 at 62061b8: Multiple Track Profiles & Superelevation Improvements - Pull request #972 at e90a2aa: On Map window color changed switch or signal is not changed - Pull request #980 at e45f14f: Downloading route content (Github, zip) second part - Pull request #981 at 10d297f: Multiple type trainset lightglows - Pull request #982 at efcf19c: WEB based Switch Panel enhancement: Alerter - Pull request #984 at 0f8122e: Player train switching for timetable mode - Pull request #900 at c27f32d: DMI updates - Pull request #876 at f92de76: docs: add source for documents previously on website to source Documentation folder
15 parents eac25ec + ca63633 + d00beb9 + 9a1d6b2 + 1f5ba4c + 8347095 + a519452 + 62061b8 + e90a2aa + e45f14f + 10d297f + efcf19c + 0f8122e + c27f32d + f92de76 commit fabc315

File tree

6 files changed

+274
-647
lines changed

6 files changed

+274
-647
lines changed

Source/Menu/ContentForm.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ private void writeAndStartInfoFile()
293293
}
294294
if (route.getDownloadType() == ContentRouteSettings.DownloadType.zip)
295295
{
296-
outputFile.WriteLine(Catalog.GetString("<p>Downloadable: zip format<br>")); // qqq
296+
outputFile.WriteLine(Catalog.GetString("<p>Downloadable: zip format<br>"));
297297
outputFile.WriteLine(Catalog.GetStringFmt("- From: {0}<br>", route.Url));
298298
if (route.InstallSize > 0)
299299
{
@@ -1477,7 +1477,7 @@ string determineUniqueRoute(string Route)
14771477
{
14781478
if (dataGridViewManualInstall.Rows[i].Cells[0].Value.ToString() == route)
14791479
{
1480-
route = route + " copy";
1480+
route += " copy";
14811481
found = false;
14821482
}
14831483
}

Source/Menu/MainForm.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -533,7 +533,7 @@ void buttonOptions_Click(object sender, EventArgs e)
533533
{
534534
SaveOptions();
535535

536-
using (var form = new OptionsForm(Settings, UpdateManager, false))
536+
using (var form = new OptionsForm(Settings, UpdateManager))
537537
{
538538
switch (form.ShowDialog(this))
539539
{

0 commit comments

Comments
 (0)