Changeset 215 for trunk/UCore.pas

Timestamp:

May 25, 2018, 8:30:06 AM (6 years ago)

Author:

chronos

Message:

• Fixed: Exceptions if game should be loaded from the file which doesn't exist.
• Fixed: New game creation after application start if it isn't loaded from file.

File:

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

trunk/UCore.pas

@@ -8 +8 @@
   Classes, SysUtils, XMLConf, FileUtil, ActnList, Controls, Dialogs, Forms,
   UGame, UApplicationInfo, UPersistentForm, UScaleDPI, UCoolTranslator,
-  URegistry, ULastOpenedList, Registry, Menus, UGeometry, UFormClient,
-  UGameServer, UGameClient, fgl, UServerList, UGameProtocol;
+  URegistry, ULastOpenedList, Registry, Menus, UFormClient,
+  UGameServer, UGameClient, fgl, UServerList;
 
 type
@@ -615 +615 @@
 
     CommandLineParams;
-    if not GameLoaded and ReopenLastFile and (LastOpenedList1.Items.Count > 0) then
+    if not GameLoaded and ReopenLastFile and (LastOpenedList1.Items.Count > 0) and
+      FileExists(LastOpenedList1.Items[0]) then
       LoadGame(LastOpenedList1.Items[0]);
     FormClientActions;
 
-    if Game.FileName = '' then StartNewGame;
+    if Game.FileName = '' then begin
+      Game.Assign(GameSettings);
+      StartNewGame;
+    end;
   end;
 end;