[X2go-Commits] x2goclient.git - master (branch) updated: 3.99.0.6-3-gfd729eb

[X2go dev team]

The branch, master has been updated
       via  fd729ebae42d707e7ee10f0456cf88360009d87a (commit)
      from  3f4eab56698f439deda4cce7629aef9558a5e9ac (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit fd729ebae42d707e7ee10f0456cf88360009d87a
Author: Oleksandr Shneyder <oleksandr.shneyder at treuchtlingen.de>
Date:   Tue Feb 7 10:03:51 2012 +0100

    Fixed segmentation fault by failed SSH connection to X2Go server

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog |    1 +
 onmainwindow.cpp |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index b4c9eef..10bb9f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ x2goclient (3.99.1.0-0~x2go1) UNRELEASED; urgency=low
 
   [ Oleksandr Shneyder ]
   * Get new ports from x2goresume-session if reserved ports are busy
+  * Fixed segmentation fault by failed SSH connection to X2Go server
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 01 Feb 2012 14:07:55 +0100
 
diff --git a/onmainwindow.cpp b/onmainwindow.cpp
index f583283..a543ce1 100644
--- a/onmainwindow.cpp
+++ b/onmainwindow.cpp
@@ -2601,6 +2601,7 @@ void ONMainWindow::slotSshConnectionError ( QString message, QString lastSession
 {
     if ( sshConnection )
     {
+        sshConnection->wait();
         delete sshConnection;
         sshConnection=0l;
     }


hooks/post-receive
-- 
x2goclient.git (X2Go Client)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2goclient.git" (X2Go Client).