[X2Go-Commits] [x2goclient] 20/31: src/pulsemanager.cpp: don't fail hard on OS X if the PA server binary could not be found in the constructor.

git-admin at x2go.org git-admin at x2go.org
Sun Mar 5 23:22:25 CET 2017


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

x2go pushed a commit to branch master
in repository x2goclient.

commit 3fc1b2f4848d099736f25e0fae28b61d064b61ed
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sat Feb 25 05:05:22 2017 +0100

    src/pulsemanager.cpp: don't fail hard on OS X if the PA server binary could not be found in the constructor.
    
    We can live without PA and will show a warning message to the user later
    on when PA is supposed to be started.
---
 debian/changelog     |  4 ++++
 src/pulsemanager.cpp | 12 ------------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2685967..7b706f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -110,6 +110,10 @@ x2goclient (4.1.0.1-0x2go1) UNRELEASED; urgency=medium
       and (debug) startup sound playback.
     - src/pulsemanager.cpp: check server_binary_ before using it and jump over
       code that assumes the PA server binary to be available.
+    - src/pulsemanager.cpp: don't fail hard on OS X if the PA server binary
+      could not be found in the constructor. We can live without PA and will
+      show a warning message to the user later on when PA is supposed to be
+      started.
 
   [ Oleksandr Shneyder ]
   * New upstream version (4.1.0.1):
diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp
index 29bf439..69d909a 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -123,18 +123,6 @@ PulseManager::PulseManager () : app_dir_ (QApplication::applicationDirPath ()),
   }
 #endif /* QT_VERSION < 0x050000 */
 
-  if (server_binary_.isEmpty ()) {
-    x2goErrorf (29) << "Unable to find the PulseAudio binary. Neither bundled, nor found in $PATH nor additional directories.";
-    show_RichText_ErrorMsgBox (tr ("Unable to find the PulseAudio binary. Neither bundled, nor found in $PATH nor additional directories."),
-                               tr ("If you downloaded the bundled, pre-compiled version from the official home page, "
-                                   "please report a bug on:\n"
-                                   "<center><a href=\"https://wiki.x2go.org/doku.php/wiki:bugs\">"
-                                     "https://wiki.x2go.org/doku.php/wiki:bugs"
-                                   "</a></center>\n"),
-                               true);
-    abort ();
-  }
-
   if (!(server_binary_.isEmpty ())) {
     QFileInfo tmp_file_info = QFileInfo (server_binary_);
     server_working_dir_ = tmp_file_info.canonicalPath ();

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