Update Mail4Delphi.pas

juliosenha · Feb 18, 2021 · be2f109 · be2f109
1 parent 939705a
commit be2f109
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/Mail4Delphi.pas b/src/Mail4Delphi.pas
@@ -315,7 +315,8 @@ destructor TMail.Destroy;
 
 function TMail.Disconnect: Boolean;
 begin
-  FIdSMTP.Disconnect;
+  if FIdSMTP.Connected then
+    FIdSMTP.Disconnect;
   UnLoadOpenSSLLibrary;
   Result := True;
 end;
@@ -326,11 +327,13 @@ class function TMail.New: IMail;
 end;
 
 function TMail.SendMail: Boolean;
+var
+  LImplicitConnection: Boolean;
 begin
   if not SetUpEmail then
     raise Exception.Create('Incomplete data!');
   if not FIdSMTP.Connected then
-    Self.Connect;
+    LImplicitConnection := Self.Connect;
   try
     try
       FIdSMTP.Send(FIdMessage);
@@ -340,7 +343,7 @@ function TMail.SendMail: Boolean;
         raise Exception.Create('Error sending message: ' + E.Message);
     end;
   finally
-    if FIdSMTP.Connected then
+    if LImplicitConnection then
       Self.Disconnect;
   end;
 end;