[X2go-Commits] x2goclient.git - master (branch) updated: 3.99.2.0-9-g8c41c07

[X2Go dev team]

The branch, master has been updated
       via  8c41c073e281b7a7d6a876381096b45458748ec1 (commit)
      from  74d212292d0e8d085032aeb59c469b8f5155e74a (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 8c41c073e281b7a7d6a876381096b45458748ec1
Author: Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
Date:   Tue Apr 17 11:56:43 2012 +0200

    removing %USERPROFILE%\.x2go\pulse\.pulse\%COMPUTERNAME%-runtime\pid if exists under windows

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

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

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 8819d32..a54b5c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ x2goclient (3.99.2.1-0~x2go1) UNRELEASED; urgency=low
     - Not starting smart card daemon before users are loaded in LDAP mode.
     - Merging onmainwindow_part*.cpp into onmainwindow.cpp
     - Support recent pulseuadio on windows
+    - removing %USERPROFILE%\.x2go\pulse\.pulse\%COMPUTERNAME%-runtime\pid
+      if exists under windows
 
   [ Daniel Lindgren ]
   * New upstream version (3.99.2.1):
diff --git a/onmainwindow.cpp b/onmainwindow.cpp
index d520df4..6879c39 100644
--- a/onmainwindow.cpp
+++ b/onmainwindow.cpp
@@ -8586,6 +8586,8 @@ void ONMainWindow::startPulsed()
     QDir drr(homeDir+"/.x2go/pulse/.pulse/"+QHostInfo::localHostName ()+"-runtime");
     if (!drr.exists())
         drr.mkpath(drr.path());
+    if (QFile::exists(homeDir+"/.x2go/pulse/.pulse/"+QHostInfo::localHostName ()+"-runtime/pid"))
+        QFile::remove(homeDir+"/.x2go/pulse/.pulse/"+QHostInfo::localHostName ()+"-runtime/pid");
     pulseDir.replace("/","\\");
     args<<"--exit-idle-time=-1"<<"-n"<<"-F"<<pulseDir+"\\config.pa";
 #else


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