[X2Go-Commits] [x2goclient] 01/01: Don't close X2Go Client if settings dialog is called before broker auth.

[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 5dfc54ffa3fdbc376f013c3de45cd8f6df012f56
Author: Oleksandr Shneyder <o.shneyder at phoca-gmbh.de>
Date:   Wed Mar 17 09:48:35 2021 -0600

    Don't close X2Go Client if settings dialog is called before broker auth.
---
 debian-common/changelog | 1 +
 src/onmainwindow.cpp    | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/debian-common/changelog b/debian-common/changelog
index d4d21fd..e9d97ac 100644
--- a/debian-common/changelog
+++ b/debian-common/changelog
@@ -16,6 +16,7 @@ x2goclient (4.1.2.3-0x2go1) UNRELEASED; urgency=medium
       session files with .x2go extension.
     - X2Go Client will send it's version to the broker when sending client
       event.
+    - Don't close X2Go Client if settings dialog is called before broker auth.
 
   [ Ryan Schmidt ]
   * New upstream version (4.1.2.3):
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index f44c75e..6a63108 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -2265,7 +2265,13 @@ void ONMainWindow::slotConfig()
 #endif /* defined (Q_OS_WIN) || defined (Q_OS_DARWIN) */
 
         if ( passForm->isVisible() && !embedMode )
+        {
+            if (brokerMode  && (!config.brokerAuthenticated))
+            {
+                return;
+            }
             slotClosePass();
+        }
         if ( sessionStatusDlg->isVisible() || embedMode )
         {
             trayIconInit();

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