From e7f72e71acef744f9c3490922fda7ae4f85e0567 Mon Sep 17 00:00:00 2001
From: david <darranz@rodax-software.com>
Date: Fri, 24 Jan 2014 11:51:19 +0000
Subject: [PATCH] =?UTF-8?q?Evitar=20errores=20al=20cerrar=20la=20aplicaci?=
 =?UTF-8?q?=C3=B3n=20servidor=20(no=20se=20cierra)=20y=20al=20elegir=20una?=
 =?UTF-8?q?=20base=20de=20datos.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@1088 0c75b7a4-871f-7646-8a2f-f78d34cc349f
---
 Source/Servidor/Configuracion/uConexionBD.pas |  3 +++
 Source/Servidor/uDataModuleServer.pas         | 16 ++++++++++------
 Source/Servidor/uServerMainForm.pas           |  2 +-
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/Source/Servidor/Configuracion/uConexionBD.pas b/Source/Servidor/Configuracion/uConexionBD.pas
index 825734a1..31fa78af 100644
--- a/Source/Servidor/Configuracion/uConexionBD.pas
+++ b/Source/Servidor/Configuracion/uConexionBD.pas
@@ -85,6 +85,9 @@ begin
   edtPath.Text := dmServer.FDBPath;
   edtUser.Text := dmServer.FDBUser;
   edtPassword.Text := Decrypt(dmServer.FDBPass);
+  if OpenDialog.InitialDir = '' then
+    OpenDialog.InitialDir := ExtractFilePath(Application.ExeName);
+  
 end;
 
 procedure TfrConexionBD.Finalize;
diff --git a/Source/Servidor/uDataModuleServer.pas b/Source/Servidor/uDataModuleServer.pas
index 21de8c69..6cc6ccae 100644
--- a/Source/Servidor/uDataModuleServer.pas
+++ b/Source/Servidor/uDataModuleServer.pas
@@ -258,7 +258,8 @@ end;
 
 procedure TdmServer.DetenerLog;
 begin
-  FEscribirLog.Free;
+  DriverManager.OnTraceEvent := NIL;
+  FreeAndNIL(FEscribirLog);
 end;
 
 procedure TdmServer.DriverManagerTraceEvent(Sender: TObject; const Text: string;
@@ -269,11 +270,14 @@ end;
 
 procedure TdmServer.EscribirLog(const AMensaje: String);
 begin
-  FEscribirLog.Enter;
-  try
-    JvLogFile1.Add(AMensaje);
-  finally
-    FEscribirLog.Leave;
+  if Assigned(FEscribirLog) then
+  begin
+    FEscribirLog.Enter;
+    try
+      JvLogFile1.Add(AMensaje);
+    finally
+      FEscribirLog.Leave;
+    end;
   end;
 end;
 
diff --git a/Source/Servidor/uServerMainForm.pas b/Source/Servidor/uServerMainForm.pas
index 5fef0451..473a7612 100644
--- a/Source/Servidor/uServerMainForm.pas
+++ b/Source/Servidor/uServerMainForm.pas
@@ -56,7 +56,7 @@ uses
 
 procedure TfServerForm.actCerrarExecute(Sender: TObject);
 begin
-  Application.Terminate;
+  Application.MainForm.Close;
 end;
 
 procedure TfServerForm.actRestartExecute(Sender: TObject);