Changeset 38 for trunk/Forms

Timestamp:

Mar 8, 2012, 3:40:45 PM (13 years ago)

Author:

chronos

Message:

• Fixed: SqlDatabase object initialized twice and freed once.

Location:

trunk/Forms

Files:

• UImportStructureForm.pas (modified) (1 diff)
• UMainForm.pas (modified) (4 diffs)

trunk/Forms/UImportStructureForm.pas

@@ -94 +94 @@
 procedure TImportStructureForm.FormShow(Sender: TObject);
 begin
-  EditHost.Text := Core.SqlDatabase1.HostName;
-  EditUser.Text := Core.SqlDatabase1.UserName;
-  EditSchema.Text := Core.SqlDatabase1.Database;
+  EditHost.Text := Core.System.Client.Host;
+  EditUser.Text := Core.System.Client.User;
+  EditSchema.Text := Core.System.Client.Schema;
 end;
 

trunk/Forms/UMainForm.pas

@@ -170 +170 @@
 procedure TMainForm.FormDestroy(Sender: TObject);
 begin
-  Report.Free;
-  TreeState.Free;
-  PersistentForm.Free;
+  FreeAndNil(Report);
+  FreeAndNil(TreeState);
+  FreeAndNil(PersistentForm);
 end;
 
@@ -254 +254 @@
 procedure TMainForm.AConnectExecute(Sender: TObject);
 begin
+  try
+    LoginForm := TLoginForm.Create(MainForm);
   Core.Profiles.LoadFromRegistry(Core.RegistryRootKey, Core.RegistryKey);
   if LoginForm.ShowModal = mrOK then begin
@@ -273 +275 @@
     end;
   end;
+  finally
+    LoginForm.Free;
+  end;
 end;
 
@@ -304 +309 @@
 procedure TMainForm.MenuItem17Click(Sender: TObject);
 begin
-  LoginForm.ShowModal;
+  try
+    LoginForm := TLoginForm.Create(MainForm);
+    LoginForm.ShowModal;
+  finally
+    LoginForm.Free;
+  end;
 end;