Merge pull request #53 from Csantucci/Event-start-activity

Csantucci · web-flow · commit 15747a1291e2 · 2019-04-23T08:09:59.000+02:00
Fix crash when activity event triggered at game start. https://bugs.launchpad.net/or/+bug/1825670
diff --git a/Source/RunActivity/Viewer3D/Popups/ActivityWindow.cs b/Source/RunActivity/Viewer3D/Popups/ActivityWindow.cs
@@ -197,6 +197,7 @@ public override void PrepareFrame(ElapsedTime elapsedTime, bool updateFull)
                                         ResumeMenu();
                                         PopupTime = DateTime.Now;
                                     }
+                                    Visible = Owner.Viewer.HelpWindow.ActivityUpdated = true;
                                 }
                                 else
                                 {
@@ -211,9 +212,9 @@ public override void PrepareFrame(ElapsedTime elapsedTime, bool updateFull)
                                             else NoPauseMenu();
                                         }
                                         PopupTime = DateTime.Now;
+                                        Visible = Owner.Viewer.HelpWindow.ActivityUpdated = true;
                                     }
-                                }
-                                Visible = Owner.Viewer.HelpWindow.ActivityUpdated = true;
+                                }                              
                             }
                             else
                             {

Original file line number	Diff line number	Diff line change
`@@ -197,6 +197,7 @@ public override void PrepareFrame(ElapsedTime elapsedTime, bool updateFull)`
`197`	`197`	`ResumeMenu();`
`198`	`198`	`PopupTime = DateTime.Now;`
`199`	`199`	`}`
	`200`	`+ Visible = Owner.Viewer.HelpWindow.ActivityUpdated = true;`
`200`	`201`	`}`
`201`	`202`	`else`
`202`	`203`	`{`
`@@ -211,9 +212,9 @@ public override void PrepareFrame(ElapsedTime elapsedTime, bool updateFull)`
`211`	`212`	`else NoPauseMenu();`
`212`	`213`	`}`
`213`	`214`	`PopupTime = DateTime.Now;`
	`215`	`+ Visible = Owner.Viewer.HelpWindow.ActivityUpdated = true;`
`214`	`216`	`}`
`215`		`- }`
`216`		`- Visible = Owner.Viewer.HelpWindow.ActivityUpdated = true;`
	`217`	`+ }`
`217`	`218`	`}`
`218`	`219`	`else`
`219`	`220`	`{`