Changeset 517 for trunk

Timestamp:

Jan 5, 2024, 4:35:41 PM (12 months ago)

Author:

chronos

Message:

• Fixed: Possible exception if there is no active form.

File:

• trunk/LocalPlayer/Term.pas (modified) (2 diffs)

trunk/LocalPlayer/Term.pas

@@ -5629 +5629 @@
 begin
   if Idle and (Me >= 0) and (GameMode <> cMovie) then
-    if (TFormStateType.fsModal in Screen.ActiveForm.FormState) or
+    if Assigned(Screen.ActiveForm) and
+      (TFormStateType.fsModal in Screen.ActiveForm.FormState) or
       (Screen.ActiveForm is TBufferedDrawDlg) and
       (TBufferedDrawDlg(Screen.ActiveForm).WindowMode <> wmPersistent) then
@@ -5662 +5663 @@
         if (dx <> 0) or (dy <> 0) then
         begin
-          if (Screen.ActiveForm <> MainScreen) and
+          if Assigned(Screen.ActiveForm) and
+            (Screen.ActiveForm <> MainScreen) and
             (@Screen.ActiveForm.OnDeactivate <> nil) then
             Screen.ActiveForm.OnDeactivate(nil);