Skip to content

Commit 0e15b24

Browse files
committed
Automatic merge of T1.5.1-535-g2f57132ee and 9 pull requests
- 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
11 parents 3dc09da + 2f57132 + 98dd1a7 + dc03850 + cc3af66 + 61bbf43 + d00beb9 + 410a585 + 36736ce + b39e5d8 + ce66076 commit 0e15b24

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

Source/RunActivity/Viewer3D/Popups/WindowManager.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,19 +172,23 @@ public void Save(BinaryWriter outf)
172172
{
173173
foreach (var window in Windows)
174174
if (!window.DoNotDisplayWindow)
175+
{
175176
// This if is added to not do the save in case of the out of focus window
176177
// See Source\RunActivity\Viewer3D\Popups\OutOfFocusWindow.cs
177178
window.Save(outf);
179+
}
178180
}
179181

180182
[CallOnThread("Render")]
181183
public void Restore(BinaryReader inf)
182184
{
183185
foreach (var window in Windows)
184186
if (!window.DoNotDisplayWindow)
187+
{
185188
// This if is added to not do the restore in case of the out of focus window
186189
// See Source\RunActivity\Viewer3D\Popups\OutOfFocusWindow.cs
187190
window.Restore(inf);
191+
}
188192
}
189193

190194
[CallOnThread("Updater")]

0 commit comments

Comments
 (0)