[X2Go-Commits] pyhoca-gui.git - build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d (branch) updated: 0.1.0.10-107-g924ed9a
X2Go dev team
git-admin at x2go.org
Tue Aug 27 13:22:06 CEST 2013
The branch, build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d has been updated
via 924ed9a645086b099c9d5e7a64bd60cd0e4d28f7 (commit)
from 8cf58882de4af11c7238aaf6a046a12b2e18ec5f (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 -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
pyhoca/wxgui/frontend.py | 4 ++--
pyhoca/wxgui/logon.py | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
The diff of changes is:
diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py
index f198759..ead1c1d 100644
--- a/pyhoca/wxgui/frontend.py
+++ b/pyhoca/wxgui/frontend.py
@@ -204,7 +204,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
self.resume_newest_on_connect = self.args.resume_newest_on_connect
self.resume_oldest_on_connect = self.args.resume_oldest_on_connect
self.resume_all_on_connect = self.args.resume_all_on_connect
- self.exit_on_disconnect = self.args.exit_on_disconnect
+ self.exit_on_disconnect = self.args.exit_on_disconnect or self.args.single_session_profile
self.disconnect_on_suspend = self.args.disconnect_on_suspend
self.disconnect_on_terminate = self.args.disconnect_on_terminate
self.show_profile_metatypes = self.args.show_profile_metatypes
@@ -540,7 +540,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
raise
- if connect_failed and (self.exit_on_disconnect or self.args.single_session_profile):
+ if connect_failed and self.exit_on_disconnect:
self.WakeUpIdle()
self.ExitMainLoop()
diff --git a/pyhoca/wxgui/logon.py b/pyhoca/wxgui/logon.py
index 9437ae6..6b66930 100644
--- a/pyhoca/wxgui/logon.py
+++ b/pyhoca/wxgui/logon.py
@@ -397,7 +397,7 @@ class PyHocaGUI_DialogBoxPassword(wx.Dialog):
try: wx.EndBusyCursor()
except: pass
- if connect_failed and (self._PyHocaGUI.exit_on_disconnect or self._PyHocaGUI.args.single_session_profile):
+ if connect_failed and self._PyHocaGUI.exit_on_disconnect:
self._PyHocaGUI.WakeUpIdle()
self._PyHocaGUI.ExitMainLoop()
hooks/post-receive
--
pyhoca-gui.git (Python X2Go Client (wxPython GUI))
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 "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).
More information about the x2go-commits
mailing list