[X2Go-Commits] [python-x2go] 07/07: take down telekinesis before taking down nxproxy when sessions suspend/terminate

[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 0d155fe891f23691d03cc3ab76769b23968ffca1
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Jun 25 01:20:15 2014 +0200

    take down telekinesis before taking down nxproxy when sessions suspend/terminate
---
 x2go/backends/terminal/plain.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x2go/backends/terminal/plain.py b/x2go/backends/terminal/plain.py
index 1b0b1e5..123d6db 100644
--- a/x2go/backends/terminal/plain.py
+++ b/x2go/backends/terminal/plain.py
@@ -1659,8 +1659,8 @@ class X2GoTerminalSession(object):
         @rtype: C{bool}
 
         """
-        self.control_session.suspend(session_name=self.session_info.name)
         self.release_telekinesis()
+        self.control_session.suspend(session_name=self.session_info.name)
         self.release_proxy()
 
         # TODO: check if session has really suspended
@@ -1676,8 +1676,8 @@ class X2GoTerminalSession(object):
         @rtype: C{bool}
 
         """
-        self.control_session.terminate(session_name=self.session_info.name, destroy_terminals=False)
         self.release_telekinesis()
+        self.control_session.terminate(session_name=self.session_info.name, destroy_terminals=False)
         self.release_proxy()
         self.post_terminate_cleanup()
         self.__del__()

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