Changeset 38

Timestamp:

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

Author:

chronos

Message:

• Fixed: SqlDatabase object initialized twice and freed once.

Location:

trunk

Files:

• Application/Clients/UChronisClientMySQL.pas (modified) (1 diff)
• Forms/UImportStructureForm.pas (modified) (1 diff)
• Forms/UMainForm.pas (modified) (4 diffs)
• UCore.lfm (modified) (1 diff)
• UCore.pas (modified) (3 diffs)
• USystem.pas (modified) (1 diff)
• chronis.lpi (modified) (1 diff)
• chronis.lpr (modified) (1 diff)

trunk/Application/Clients/UChronisClientMySQL.pas

@@ -159 +159 @@
 destructor TChronisClientMySQL.Destroy;
 begin
-  Database.Free;
+  FreeAndNil(Database);
   inherited Destroy;
 end;

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;
 

trunk/UCore.lfm

@@ -12 +12 @@
     top = 55
   end
-  object SqlDatabase1: TSqlDatabase
-    Connected = False
-    Port = 3306
-    Encoding = 'utf8'
-    OnLogQuery = SqlDatabase1LogQuery
-    left = 200
-    top = 55
-  end
   object DebugLog1: TDebugLog
     WriteToFileEnable = False

trunk/UCore.pas

@@ -16 +16 @@
     CoolTranslator1: TCoolTranslator;
     DebugLog1: TDebugLog;
-    SqlDatabase1: TSqlDatabase;
     procedure DataModuleCreate(Sender: TObject);
     procedure DataModuleDestroy(Sender: TObject);
@@ -56 +55 @@
   System := TChronisBase.Create;
   System.Client := TChronisClientMySQL.Create;
-  TChronisClientMySQL(System.Client).Database := SqlDatabase1;
+  //TChronisClientMySQL(System.Client).Database := SqlDatabase1;
   System.RegisterModule(TModuleSystem);
   System.ModuleSystem := TModuleSystem(System.Modules.Last);
@@ -68 +67 @@
 begin
   SaveToRegistry;
-  System.Free;
-  Profiles.Free;
+  FreeAndNil(System);
+  FreeAndNil(Profiles);
 end;
 

trunk/USystem.pas

@@ -658 +658 @@
 destructor TChronisBase.Destroy;
 begin
-  Types.Free;
-  Modules.Free;
-  Client.Free;
+  FreeAndNil(Types);
+  FreeAndNil(Modules);
+  FreeAndNil(Client);
   inherited Destroy;
 end;

trunk/chronis.lpi

@@ -291 +291 @@
         <StackChecks Value="True"/>
       </Checks>
+      <VerifyObjMethodCallValidity Value="True"/>
     </CodeGeneration>
     <Linking>
       <Debugging>
-        <DebugInfoType Value="dsStabs"/>
         <UseHeaptrc Value="True"/>
       </Debugging>

trunk/chronis.lpr

@@ -35 +35 @@
   Application.CreateForm(TCore, Core);
   Application.CreateForm(TMainForm, MainForm);
-  Application.CreateForm(TLoginForm, LoginForm);
-  Application.CreateForm(TImportStructureForm, ImportStructureForm);
-  Application.CreateForm(TLoginProfileForm, LoginProfileForm);
   Application.Run;
 end.