[X2Go-Commits] [x2goclient] 01/01: src/onmainwindow.cpp: correctly initialize pulseManager and pulseManagerThread member variables.

[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 cdead8f67c8c9e38d409bb2fc20fa5c422f06ef3
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Mon Jan 23 17:14:36 2017 +0100

    src/onmainwindow.cpp: correctly initialize pulseManager and pulseManagerThread member variables.
    
    Fixes crashes on OS X and Windows if X2Go Client terminates before these
    objects have been created at run time (for instance when running
    x2goclient --help.)
---
 debian/changelog     |    4 ++++
 src/onmainwindow.cpp |    8 ++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 35c0c09..daaed7d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -551,6 +551,10 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
       heap. Keep it on the stack.
     - src/x2goclient.cpp: use $PATH-exploration when re-executing x2goclient
       in UNIX cleanup helper mode. Fixes: #1139.
+    - src/onmainwindow.cpp: correctly initialize pulseManager and
+      pulseManagerThread member variables. Fixes crashes on OS X and Windows
+      if X2Go Client terminates before these objects have been created at run
+      time (for instance when running x2goclient --help.)
 
   [ Bernard Cafarelli ]
   * New upstream version (4.1.0.0):
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index e23c713..a7616c9 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -203,6 +203,8 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent )
     embedControlChanged=false;
     statusString=tr ( "connecting" );
 
+    pulseManager = NULL;
+    pulseManagerThread = NULL;
 
 
     hide();
@@ -1507,8 +1509,10 @@ void ONMainWindow::closeClient()
     if (pulseManager) {
         delete (pulseManager);
 
-        pulseManagerThread->quit ();
-        pulseManagerThread->wait ();
+        if (pulseManagerThread) {
+            pulseManagerThread->quit ();
+            pulseManagerThread->wait ();
+        }
 
         delete (pulseManagerThread);
     }

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git