--- Merging r36383 into '.':

U    packages/fcl-db/src/base/database.inc
--- Recording mergeinfo for merge of r36383 into '.':
 U   .

# revisions: 36383


git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@36384 3ad0048d-3df7-0310-abae-a5850022a9f2

1 files changed, 6 insertions, 4 deletions

diff --git a/packages/fcl-db/src/base/database.inc b/packages/fcl-db/src/base/database.inc
index bbf81c9eb2..6d06c9bdea 100644
--- a/packages/fcl-db/src/base/database.inc
+++ b/packages/fcl-db/src/base/database.inc
@@ -525,10 +525,12 @@ begin
     begin
     GetLoginParams(ADatabaseName, AUserName, APassword);
     if Assigned(FOnLogin) then
-      FOnLogin(Self, AUserName, APassword)
+      FOnLogin(Self, AUserName, APassword) // by value
     else if Assigned(LoginDialogExProc) then
-      LoginDialogExProc(ADatabaseName, AUserName, APassword, False);
-    SetLoginParams(ADatabaseName, AUserName, APassword);
+      begin
+      LoginDialogExProc(ADatabaseName, AUserName, APassword, False); // by reference
+      SetLoginParams(ADatabaseName, AUserName, APassword);
+      end;
     end;
 end;
 
@@ -572,7 +574,7 @@ begin
   if IsPublishedProp(Self,'UserName') then
     AUserName := GetStrProp(Self,'UserName');
   if IsPublishedProp(Self,'Password') then
-    APassword := 'Password';
+    APassword := GetStrProp(Self,'Password');
 end;
 
 procedure TCustomConnection.SetLoginParams(const ADatabaseName, AUserName, APassword: string);