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
Xpra-org · May 13, 2015 · 3b93480 · 3b93480
1 parent e2e0520
commit 3b93480
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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):