[X2Go-Commits] [python-x2go] 01/01: Windows: Fix crash while attempting to find the session window.

[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 python-x2go.

commit 9f2d9ecba4200b9248786174a740c06d4a8700db
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Apr 16 12:49:33 2014 +0200

    Windows: Fix crash while attempting to find the session window.
---
 debian/changelog                |    1 +
 x2go/backends/terminal/plain.py |    7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index df75e29..320fda0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -36,6 +36,7 @@ python-x2go (0.5.0.0-0x2go1) UNRELEASED; urgency=low
     - Session profiles: default value type for exports session profile option
       is an empty dictionary.
     - Make X2GoClient's constructor aware of non-usable X-Server ports.
+    - Windows: Fix crash while attempting to find the session window.
   * debian/control:
     + Add dependencies: python-requests, python-simplejson.
   * python-x2go.spec:
diff --git a/x2go/backends/terminal/plain.py b/x2go/backends/terminal/plain.py
index ef1898d..235de1d 100644
--- a/x2go/backends/terminal/plain.py
+++ b/x2go/backends/terminal/plain.py
@@ -1046,8 +1046,11 @@ class X2GoTerminalSession(object):
             window = utils.find_session_window(self.session_info.name)
 
             if window is not None:
-                self.logger('Session window ID for session %s is: %s' % (self.session_info.name, window.id), loglevel=log.loglevel_DEBUG)
-                self.session_window = window
+                if _X2GOCLIENT_OS == "Windows":
+                    self.logger('Session window handle for session %s is: %s' % (self.session_info.name, window), loglevel=log.loglevel_DEBUG)
+                else:
+                    self.logger('Session window ID for session %s is: %s' % (self.session_info.name, window.id), loglevel=log.loglevel_DEBUG)
+                    self.session_window = window
                 break
 
             gevent.sleep(1)

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