[X2Go-Commits] [x2goclient] 01/01: onmainwindow.cpp: don't terminate if scdaemon exited with non-zero exit code.

git-admin at x2go.org git-admin at x2go.org
Wed Jun 10 15:09:09 CEST 2015


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goclient.

commit 5be62d3b2bc8d42978b5720af5388a2c8b10f841
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Wed Jun 10 15:08:46 2015 +0200

    onmainwindow.cpp: don't terminate if scdaemon exited with non-zero exit code.
---
 debian/changelog     |    2 ++
 src/onmainwindow.cpp |    6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 135974d..ec86448 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -48,6 +48,8 @@ x2goclient (4.0.4.1-0x2go1) UNRELEASED; urgency=low
       No need for an OS X-specific variable anymore.
     - onmainwindow.cpp: fix compile error - use QString.toAscii () to get a
       valid C string representation for tr ().
+    - onmainwindow.cpp: don't terminate if scdaemon exited with non-zero exit
+      code.
 
  -- X2Go Release Manager <git-admin at x2go.org>  Tue, 26 May 2015 21:42:09 +0200
 
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index c3f87c3..f5e8984 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -8478,8 +8478,10 @@ void ONMainWindow::slotScDaemonError (QProcess::ProcessError error) {
             break;
         }
         case QProcess::Crashed: {
-            main_text += tr ("started, but crashed.");
-            break;
+            /* This means the process exited with a non-zero exit code.
+             * It didn't really crash at all. Everything is fine.
+             * Just restart it. */
+            return;
         }
         case QProcess::Timedout: {
             main_text += tr ("didn't start yet.");

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


More information about the x2go-commits mailing list