Converter: fix a memory leak when converting a single unit.

git-svn-id: trunk@39670 -

converter/convertdelphi.pas

@@ -866,34 +866,39 @@ var
 begin
   IDEMessagesWindow.Clear;
   DelphiUnit := TDelphiUnit.Create(Self, fOrigFilename, []);
-  Result:=fSettings.RunForm(Nil);
+  try
-  if Result=mrOK then
+    Result:=fSettings.RunForm(Nil);
-    with DelphiUnit do
+    if Result=mrOK then begin
-    try
+      with DelphiUnit do
-      Result:=CopyAndLoadFile;
+      try
-      if Result=mrOK then begin
+        Result:=CopyAndLoadFile;
-        Result:=ConvertUnitFile;
+        if Result=mrOK then begin
-        if Result=mrOk then begin
+          Result:=ConvertUnitFile;
-          Result:=SaveCodeBufferToFile(fPascalBuffer,fLazUnitFilename);
           if Result=mrOk then begin
-            Result:=LazarusIDE.DoOpenEditorFile(fLazUnitFilename,0,0,
+            Result:=SaveCodeBufferToFile(fPascalBuffer,fLazUnitFilename);
-                                                [ofAddToRecent,ofQuiet]);
             if Result=mrOk then begin
-              Result:=ConvertFormFile;
+              Result:=LazarusIDE.DoOpenEditorFile(fLazUnitFilename,0,0,
+                                                  [ofAddToRecent,ofQuiet]);
+              if Result=mrOk then begin
+                Result:=ConvertFormFile;
+              end;
             end;
           end;
         end;
+      except
+        on e: EDelphiConverterError do begin
+          fErrorMsg:=e.Message;
+        end;
+        else begin
+          fErrorMsg:=CodeToolBoss.ErrorMessage;
+        end;
+        Result:=mrAbort;
       end;
-    except
-      on e: EDelphiConverterError do begin
-        fErrorMsg:=e.Message;
-      end;
-      else begin
-        fErrorMsg:=CodeToolBoss.ErrorMessage;
-      end;
-      Result:=mrAbort;
     end;
-  ShowEndingMessage(Result);
+    ShowEndingMessage(Result);
+  finally
+    DelphiUnit.Free;
+  end;
 end;
 
 { TConvertDelphiProjPack }
@@ -1311,8 +1316,7 @@ end;
 
 destructor TConvertDelphiProject.Destroy;
 begin
-  if Assigned(fMainUnitConverter) then
+  fMainUnitConverter.Free;
-    fMainUnitConverter.Free;
   inherited Destroy;
 end;