Skip to content

Commit

Permalink
#626 make the server run all the cleanups (including its own one) via…
Browse files Browse the repository at this point in the history
… "run_cleanups", this ensures that we always call kill_xvfb before we exit

git-svn-id: https://xpra.org/svn/Xpra/trunk@7134 3bb7dfac-3a0b-4e04-842a-767bc560f471
  • Loading branch information
totaam committed Aug 5, 2014
1 parent ae83a70 commit 94b31b2
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion src/xpra/scripts/server.py
Original file line number Diff line number Diff line change
Expand Up @@ -930,7 +930,10 @@ def run_server(error_cb, opts, mode, xpra_file, extra_args):
return 1
app = XpraServer()
app.init(clobber, opts)
_cleanups.insert(0, app.cleanup)
#ensure app.cleanup will fire all cleanups,
#incuding its own cleanups
_cleanups.insert(0, app.cleanup)
app.cleanup = run_cleanups

app.init_sockets(sockets)
app.init_when_ready(_when_ready)
Expand Down

0 comments on commit 94b31b2

Please sign in to comment.