[X2Go-Commits] x2goclient.git - master (branch) updated: 4.0.1.0-23-g5bcfbeb

[X2Go dev team]

The branch, master has been updated
       via  5bcfbeba7660328543370bcbd4b72bc33add5238 (commit)
      from  7a76ed9a7b420ba037ccc8ab6073be566fcdd99a (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 5bcfbeba7660328543370bcbd4b72bc33add5238
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Jun 7 21:04:40 2013 +0200

    Fix segmentation fault that started occurring since the custom trayIcon patch was applied. Segfault only occurred if the tray icon was not used.

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

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

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index e3a1cd1..1274d75 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,8 @@ x2goclient (4.0.1.1-0~x2go1) UNRELEASED; urgency=low
       mode.
     - Properly set the remote server address received via selectUserSession
       method when in broker mode. (Fixes: #226).
+    - Fix segmentation fault that started occurring since the custom trayIcon
+      patch was applied. Segfault only occurred if the tray icon was not used.
 
   [ Ezra Bühler ]
   * New upstream version (4.0.1.1):
diff --git a/onmainwindow.cpp b/onmainwindow.cpp
index 1d9ca54..68e7e4a 100644
--- a/onmainwindow.cpp
+++ b/onmainwindow.cpp
@@ -5336,7 +5336,8 @@ void ONMainWindow::slotProxyFinished ( int,QProcess::ExitStatus )
 {
 
     //set tray icon to default
-    trayIcon->setIcon(QIcon ( ":icons/128x128/x2go.png") );
+    if (trayIcon)
+        trayIcon->setIcon(QIcon ( ":icons/128x128/x2go.png") );
 
 
     if ( embedMode )


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).