[X2Go-Commits] [x2goclient] 01/01: Do not delete session from list if terminating of session is canceled.

[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 4f9286b7fcdc3e1445479b0e8ae65287e7070410
Author: Oleksandr Shneyder <o.shneyder at phoca-gmbh.de>
Date:   Tue Oct 29 14:09:00 2019 +0100

    Do not delete session from list if terminating of session is canceled.
---
 debian/changelog     | 1 +
 src/onmainwindow.cpp | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 6272987..0a280b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -40,6 +40,7 @@ x2goclient (4.1.2.2-0x2go1) UNRELEASED; urgency=medium
     - Do not show Pulseaudio warning on Windows, if Pulseaudio is disabled in settings or by command line.
     - Improve request handling in HTTP broker.
     - Add possibility to suspend and terminate sessions from session selection dialog in broker mode.
+    - Do not delete session from list if terminating of session is canceled.
 
   [ Mihai Moldovan ]
   * New upstream version (4.1.2.2):
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index 823fd81..872f952 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -6933,7 +6933,8 @@ bool ONMainWindow::termSession ( QString sessId, bool warn )
         if ( answer !=
                 QMessageBox::Yes )
         {
-            slotRetTermSess ( true,QString::null,0 );
+            if ( selectSessionDlg->isVisible() )
+                selectSessionDlg->setEnabled ( true );
             return false;
         }
     }

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