From 3b93480a1cde49aba7b015e4326269b4fe79963a Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Wed, 13 May 2015 04:04:17 +0000 Subject: [PATCH] call stop_protocol() via idle_add to prevent deadlocks on win32! git-svn-id: https://xpra.org/svn/Xpra/trunk@9339 3bb7dfac-3a0b-4e04-842a-767bc560f471 --- src/xpra/net/subprocess_wrapper.py | 3 ++- src/xpra/sound/wrapper.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/xpra/net/subprocess_wrapper.py b/src/xpra/net/subprocess_wrapper.py index e3621a65f2..7de726c897 100644 --- a/src/xpra/net/subprocess_wrapper.py +++ b/src/xpra/net/subprocess_wrapper.py @@ -315,7 +315,8 @@ def cleanup(self): def stop(self): self.stop_process() - self.stop_protocol() + #call via idle_add to prevent deadlocks on win32! + glib.idle_add(self.stop_protocol) def stop_process(self): log("%s.stop_process() sending stop request to %s", self, self.description) diff --git a/src/xpra/sound/wrapper.py b/src/xpra/sound/wrapper.py index 468ce081b8..0c41a44401 100644 --- a/src/xpra/sound/wrapper.py +++ b/src/xpra/sound/wrapper.py @@ -189,7 +189,8 @@ def verify_started(self): def subprocess_signal(self, wrapper, proc): log("subprocess_signal: %s", proc) - self.stop_protocol() + #call via idle_add to prevent deadlocks on win32! + glib.idle_add(self.stop_protocol) def state_changed(self, wrapper, new_state):