Changeset 132 for trunk/UCore.pas

Timestamp:

Jun 19, 2017, 10:06:50 AM (7 years ago)

Author:

chronos

Message:

• Fixed: Some application states were not stored/restored correctly after application restart.
• Fixed: Default maximized form state for PersistentForm.
• Fixed: Do not scale up maximized forms according DPI settings.

File:

• trunk/UCore.pas (modified) (2 diffs)

trunk/UCore.pas

@@ -224 +224 @@
       FormNew.Show;
       FormNew.Hide;
-      for I := 0 to Screen.FormCount - 1 do begin
+      for I := 0 to Screen.FormCount - 1 do
+      if (Screen.Forms[I].WindowState = wsNormal) or
+        (Screen.Forms[I].WindowState = wsMinimized) then begin
         StoreDimensions(Screen.Forms[I], StoredDimension);
         ScaleDimensions(Screen.Forms[I], StoredDimension);
@@ -436 +438 @@
 procedure TCore.Init;
 begin
-  {$IFDEF Linux}
-  // If installed in Linux system then use installation directory for po files
-  if Application.ExeName = '/usr/bin/xtactics' then
-    CoolTranslator1.POFilesFolder := '/usr/share/xtactics/languages';
-  {$ENDIF}
-  FInitialized := True;
-
-  LoadConfig;
-  Game.LoadConfig(XMLConfig1, 'Game');
-
-  // Update translated default player names
-  TPlayer(Game.Players[0]).Name := SPlayer + ' 1';
-  TPlayer(Game.Players[1]).Name := SPlayer + ' 2';
-
-  CommandLineParams;
-  ScaleDPI;
-
-  if Game.FileName = '' then StartNewGame;
+  if not Core.Initialized then begin
+    {$IFDEF Linux}
+    // If installed in Linux system then use installation directory for po files
+    if Application.ExeName = '/usr/bin/xtactics' then
+      CoolTranslator1.POFilesFolder := '/usr/share/xtactics/languages';
+    {$ENDIF}
+    FInitialized := True;
+
+    LoadConfig;
+    Game.LoadConfig(XMLConfig1, 'Game');
+
+    // Update translated default player names
+    TPlayer(Game.Players[0]).Name := SPlayer + ' 1';
+    TPlayer(Game.Players[1]).Name := SPlayer + ' 2';
+
+    CommandLineParams;
+    ScaleDPI;
+
+    if Game.FileName = '' then StartNewGame;
+  end;
 end;