[X2Go-Commits] [x2goclient] 03/06: In direct RDP mode, when using broker, forward username and password to the RDP client if user enetered any.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goclient.

commit e1489909b5c139b6a86a19652387f50af3bb9841
Author: Oleksandr Shneyder <o.shneyder at phoca-gmbh.de>
Date:   Wed Jul 12 14:43:10 2023 +0200

    In direct RDP mode, when using broker, forward username and password to the RDP client if user enetered any.
---
 debian/changelog     | 2 ++
 src/onmainwindow.cpp | 8 ++++++++
 2 files changed, 10 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 2b9cc33b..40ddb3c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ x2goclient (4.1.2.4-0x2go1) UNRELEASED; urgency=medium
 
   [ Oleksandr Shneyder ]
   * Fix crashes when syn reply arriving after the session is started, when using broker
+  * In direct RDP mode, when using broker, forward username and password to the RDP client
+    if user enetered any.
 
  -- X2Go Release Manager <git-admin at x2go.org>  Thu, 29 Jun 2023 20:54:03 +0200
 
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index 3d577590..b66ec922 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -3633,6 +3633,14 @@ void ONMainWindow::startDirectRDP()
     {
         user=st->setting()->value ( sid+"/user",
                                        ( QVariant ) "").toString();
+        if(getCurrentUname().length()>0)
+        {
+            user=getCurrentUname();
+        }
+        if(getCurrentPass().length()>0)
+        {
+            password=getCurrentPass();
+        }
     }
 
     nxproxy=new QProcess;

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git