This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goclient. from bf08804 Fix crashing if the path for automount in the session config file in wrong format. Supporting both Windows and Linux path in automount format. Check if path exists before mounting. new b8cd0d5 Do not show Pulseaudio warning on Windows, if Pulseaudio is disabled in settings or by command line. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 1 + src/onmainwindow.cpp | 28 ++++++++++++++++++---------- 2 files changed, 19 insertions(+), 10 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit b8cd0d538532ef052eced7f6a87ce5b5d9c7b45a Author: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> Date: Wed Sep 4 10:30:07 2019 +0200 Do not show Pulseaudio warning on Windows, if Pulseaudio is disabled in settings or by command line. --- debian/changelog | 1 + src/onmainwindow.cpp | 28 ++++++++++++++++++---------- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5275843..5235ebb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -37,6 +37,7 @@ x2goclient (4.1.2.2-0x2go1) UNRELEASED; urgency=medium - Do not show password in debug output of HTTP broker. - Fix crashing if the path for automount in the session config file in wrong format. Supporting both Windows and Linux path in automount format. Check if path exists before mounting. + - Do not show Pulseaudio warning on Windows, if Pulseaudio is disabled in settings or by command line. [ Mihai Moldovan ] * New upstream version (4.1.2.2): diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index 386c116..13c69cd 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -5510,16 +5510,24 @@ void ONMainWindow::slotRetResumeSess ( bool result, true ).toBool(); #if defined (Q_OS_WIN) || defined (Q_OS_DARWIN) - if (sound) { + if (sound) + { if(!pulseManager || !(pulseManager->is_server_running())) - { - show_RichText_WarningMsgBox (tr("PulseAudio is not running"), - tr("Sound output will be disabled for this session. Please enable PulseAudio in the configuration dialog or disable sound in the session settings"),true); - sound=false; - } - else - { - switch (sndSystem) { + { + X2goSettings st ("settings"); + bool disablePA = st.setting ()->value ("pulse/disable", + (QVariant) false).toBool (); + if(!systemDisablePA && ! disablePA) + { + show_RichText_WarningMsgBox (tr("PulseAudio is not running"), + tr("Sound output will be disabled for this session. Please enable PulseAudio in the configuration dialog or disable sound in the session settings"),true); + } + sound=false; + } + else + { + switch (sndSystem) + { case PULSE: sndPort = QString::number (pulseManager->get_pulse_port ()); break; @@ -5527,7 +5535,7 @@ void ONMainWindow::slotRetResumeSess ( bool result, sndPort = QString::number (pulseManager->get_esd_port ()); break; } - } + } } #endif /* defined (Q_OS_WIN) || defined (Q_OS_DARWIN) */ -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
-
git-admin＠x2go.org