[X2Go-Commits] [pyhoca-gui] 02/02: Make check_running() test terminal server / multi-session safe. (Fixes: #19).

[git-admin at x2go.org]

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

x2go pushed a commit to branch master
in repository pyhoca-gui.

commit 4387ad81205fdc9b67d7498d7b6aa7ea77829264
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Apr 15 21:02:15 2014 +0200

    Make check_running() test terminal server / multi-session safe. (Fixes: #19).
---
 debian/changelog         |    1 +
 pyhoca/wxgui/launcher.py |    7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0719443..67836c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -40,6 +40,7 @@ pyhoca-gui (0.5.0.0-0x2go1) UNRELEASED; urgency=low
       provided: username, if no URL provided: broker-URL field).
     - Fix check_running() method in PyHocaGUI_Launcher on MS Windows.
     - Make broker support available for the MS Windows build of PyHoca-GUI.
+    - Make check_running() test terminal server / multi-session safe. (Fixes: #19).
     - Update English / German translation.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 08 Jan 2014 21:28:37 +0100
diff --git a/pyhoca/wxgui/launcher.py b/pyhoca/wxgui/launcher.py
index b09bd11..a207728 100644
--- a/pyhoca/wxgui/launcher.py
+++ b/pyhoca/wxgui/launcher.py
@@ -155,10 +155,11 @@ VERSION: %s
         elif X2GOCLIENT_OS == 'Windows':
             import wmi
             w = wmi.WMI()
-            _p_names = []
+            _p = {}
             for process in w.Win32_Process():
-                _p_names.append(process.Name)
-            return len([ _p_name for _p_name in _p_names if _p_name == _executable]) > 1
+                if process.Name == _executable:
+                    _p[process.ProcessId] = process.SessionId
+            return len([ _p_id for _p_id in _p.keys() if _p[PROG_PID] ==  _p[_p_id]) > 1
 
 
     def version(self):

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