Changeset 38 for trunk/Forms/UFormContact.pas

Timestamp:

Nov 25, 2021, 3:35:59 PM (3 years ago)

Author:

chronos

Message:

• Fixed: Avoid exception if photo data are not valid image data.
• Fixed: Some contact fields were not saved.

File:

• trunk/Forms/UFormContact.pas (modified) (2 diffs)

trunk/Forms/UFormContact.pas

@@ -204 +204 @@
           JpegImage := TJPEGImage.Create;
           try
-            JpegImage.LoadFromStream(Stream);
-            ImagePhoto.Picture.Bitmap.SetSize(JpegImage.Width, JpegImage.Height);
-            ImagePhoto.Picture.Bitmap.Canvas.Draw(0, 0, JpegImage);
+            try
+              JpegImage.LoadFromStream(Stream);
+              ImagePhoto.Picture.Bitmap.SetSize(JpegImage.Width, JpegImage.Height);
+              ImagePhoto.Picture.Bitmap.Canvas.Draw(0, 0, JpegImage);
+            except
+            end;
           finally
             JpegImage.Free;
           end;
         end else begin
-          ImagePhoto.Picture.Bitmap.LoadFromStream(Stream);
+          try
+            ImagePhoto.Picture.LoadFromStream(Stream);
+          except
+          end;
         end;
       finally
@@ -222 +228 @@
 procedure TFormContact.SaveData(Contact: TContact);
 begin
+  Contact.Fields[cfFullName] := EditFullName.Text;
+  Contact.Fields[cfMiddleName] := EditMiddleName.Text;
   Contact.Fields[cfFirstName] := EditFirstName.Text;
   Contact.Fields[cfLastName] := EditLastName.Text;
+  Contact.Fields[cfTitleAfter] := EditTitleAfter.Text;
+  Contact.Fields[cfTitleBefore] := EditTitleBefore.Text;
   Contact.Fields[cfTelCell] := EditCellPhone.Text;
   Contact.Fields[cfTelHome] := EditPhoneHome.Text;