Changeset 405 for branches/highdpi/Start.pas

Timestamp:

Nov 3, 2021, 11:22:02 AM (2 years ago)

Author:

chronos

Message:

• Modified: Merged changes from trunk r404.

File:

• branches/highdpi/Start.pas (modified) (5 diffs)

branches/highdpi/Start.pas

@@ -428 +428 @@
     Free;
   end;
+
+  KeyBindings.LoadFromRegistry(HKEY_CURRENT_USER, AppRegistryKey + '\KeyBindings');
 end;
 
@@ -450 +452 @@
     Free;
   end;
+
+  KeyBindings.SaveToRegistry(HKEY_CURRENT_USER, AppRegistryKey + '\KeyBindings');
 end;
 
@@ -1624 +1628 @@
   f: file;
   ok: boolean;
+  MapPictureFileName: string;
 begin
   if List.ItemIndex >= 0 then
@@ -1644 +1649 @@
         begin
           SimpleMessage(Format(Phrases.Lookup('NOFILENAME'), [NewName[i]]));
-          exit
+          Exit;
         end;
       if Page = pgLoad then
@@ -1659 +1664 @@
       except
         // Play('INVALID');
-        ok := false
-      end;
-      if Page <> pgLoad then
-        try // rename map picture
+        ok := False;
+      end;
+      if Page <> pgLoad then begin
+        // Rename map picture
+        MapPictureFileName := GetMapsDir + DirectorySeparator +
+          List.Items[List.ItemIndex] + CevoMapPictureExt;
+        if FileExists(MapPictureFileName) then
+        try
           AssignFile(f, GetMapsDir + DirectorySeparator + List.Items[List.ItemIndex]
-            + '.png');
-          Rename(f, GetMapsDir + DirectorySeparator + NewName + '.png');
+            + CevoMapPictureExt);
+          Rename(f, GetMapsDir + DirectorySeparator + NewName + CevoMapPictureExt);
         except
         end;
-      if ok then
-      begin
+      end;
+      if ok then begin
         if Page = pgLoad then
           FormerGames[List.ItemIndex] := NewName