Skip to content

Commit

Permalink
Automatic merge of T1.5.1-535-g2f57132ee and 9 pull requests
Browse files Browse the repository at this point in the history
- Pull request #757 at 98dd1a7: Unify RailDriver code implementations
- Pull request #799 at dc03850: Consolidated wind simulation
- Pull request #821 at cc3af66: Adds suppression of safety valves
- Pull request #831 at 61bbf43: poor mans switch panel on tablet
- Pull request #839 at d00beb9: First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters
- Pull request #841 at 410a585: https://blueprints.launchpad.net/or/+spec/animating-trainset-windows
- Pull request #853 at 36736ce: Notify out of focus
- Pull request #855 at b39e5d8: Adds new route from TrainSimulations
- Pull request #856 at ce66076: Add Alternate Syntax for Confusing Tokens
  • Loading branch information
openrails-bot committed Aug 1, 2023
11 parents 3dc09da + 2f57132 + 98dd1a7 + dc03850 + cc3af66 + 61bbf43 + d00beb9 + 410a585 + 36736ce + b39e5d8 + ce66076 commit 0e15b24
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions Source/RunActivity/Viewer3D/Popups/WindowManager.cs
Expand Up @@ -172,19 +172,23 @@ public void Save(BinaryWriter outf)
{
foreach (var window in Windows)
if (!window.DoNotDisplayWindow)
{
// This if is added to not do the save in case of the out of focus window
// See Source\RunActivity\Viewer3D\Popups\OutOfFocusWindow.cs
window.Save(outf);
}
}

[CallOnThread("Render")]
public void Restore(BinaryReader inf)
{
foreach (var window in Windows)
if (!window.DoNotDisplayWindow)
{
// This if is added to not do the restore in case of the out of focus window
// See Source\RunActivity\Viewer3D\Popups\OutOfFocusWindow.cs
window.Restore(inf);
}
}

[CallOnThread("Updater")]
Expand Down

0 comments on commit 0e15b24

Please sign in to comment.