Skip to content

Commit

Permalink
#669: give more time for a clean pipeline shutdown
Browse files Browse the repository at this point in the history
git-svn-id: https://xpra.org/svn/Xpra/trunk@8975 3bb7dfac-3a0b-4e04-842a-767bc560f471
  • Loading branch information
totaam committed Apr 8, 2015
1 parent 577d387 commit 64c3b95
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions src/xpra/sound/wrapper.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,11 @@ def stop(self):
wo = self.wrapped_object
log("stop() wrapped object=%s", wo)
if wo:
wo.cleanup()
self.wrapped_object = None
subprocess_callee.stop(self)
wo.cleanup()
#this will stop the protocol and main loop
#so call it with a delay so the sound pipeline can shutdown cleanly
gobject.timeout_add(250, subprocess_callee.stop, self)

def export_info(self):
wo = self.wrapped_object
Expand Down Expand Up @@ -153,7 +155,8 @@ def __init__(self, description):
def cleanup(self):
log("cleanup() sending request to cleanup")
self.send("cleanup")
gobject.timeout_add(200, self.stop)
#cleanup should cause the process to exit
gobject.timeout_add(500, self.stop)


def state_changed(self, sink, new_state):
Expand Down

0 comments on commit 64c3b95

Please sign in to comment.