From 94b31b28fd2833c11c272d3cad1e060393a383aa Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Tue, 5 Aug 2014 09:41:16 +0000 Subject: [PATCH] #626 make the server run all the cleanups (including its own one) via "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 --- src/xpra/scripts/server.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/xpra/scripts/server.py b/src/xpra/scripts/server.py index 9991c174ab..619b7cff23 100644 --- a/src/xpra/scripts/server.py +++ b/src/xpra/scripts/server.py @@ -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)