Skip to content

Commit fda6310

Browse files
committed
Automatic merge of T1.5.1-922-g0a17d985e and 15 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 3ca0eb1: Blueprint/train car operations UI window - Pull request #885 at 03d4a52: 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 #903 at 29f3d1a: Downloading route content (Github, zip) - Pull request #912 at f7b85e4: New Triple Valve Features Vol. 2 - Pull request #919 at 26cc6a8: Added mouse wheel support for controls which can be moved by pressing t… - Pull request #923 at e0f3c55: Add curve squeal to route - Pull request #924 at 6c2c3cd: Default Asset Improvements - Pull request #925 at e3b1688: Fix brakeshoe force bug - Pull request #927 at cf687d4: AI Train Power Supply/Lights Fix
17 parents fc6640f + 0a17d98 + 3539862 + d00beb9 + f92de76 + 3ca0eb1 + 03d4a52 + 6c0785b + 1f5ba4c + 5866028 + 29f3d1a + f7b85e4 + 26cc6a8 + e0f3c55 + 6c2c3cd + e3b1688 + cf687d4 commit fda6310

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

Source/Menu/Notifications/NotificationManager.cs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,8 @@ private Check CheckExcludes(Check check)
251251
if (SystemInfo.Application.Version.IndexOf(c.Value, StringComparison.OrdinalIgnoreCase) > -1)
252252
return check;
253253
break;
254+
case "already updated": // ReplaceParameter() changed {{new_version}} to "already updated"
255+
break;
254256
case "system":
255257
var os = SystemInfo.OperatingSystem;
256258
var system = $"{os.Name} {os.Version} {os.Architecture} {os.Language} {os.Languages ?? new string[0]}";
@@ -380,9 +382,10 @@ private string ReplaceParameter(string field)
380382
case "new_version":
381383
replacement = UpdateManager.LastUpdate == null
382384
|| UpdateManager.ChannelName == ""
383-
|| UpdateManager.LastUpdate.Version == SystemInfo.Application.Version
384-
? "none"
385-
: UpdateManager.LastUpdate.Version;
385+
? "not available"
386+
: UpdateManager.LastUpdate.Version == SystemInfo.Application.Version
387+
? "already updated"
388+
: UpdateManager.LastUpdate.Version;
386389
break;
387390
case "release_date":
388391
replacement = UpdateManager.LastUpdate == null

0 commit comments

Comments
 (0)