From fe67e58b57d88e3d274c73cf87d049b7f33a7fda Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sun, 26 Aug 2018 20:18:10 +0000 Subject: [PATCH] #1840 / #1931: if we have consumed the start[-child] command line options, clear the values so we don't end up requesting those a second time git-svn-id: https://xpra.org/svn/Xpra/trunk@20211 3bb7dfac-3a0b-4e04-842a-767bc560f471 --- src/xpra/scripts/main.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/xpra/scripts/main.py b/src/xpra/scripts/main.py index 1d5e90def3..e347bcb9fe 100755 --- a/src/xpra/scripts/main.py +++ b/src/xpra/scripts/main.py @@ -1311,6 +1311,9 @@ def handshake_complete(*_args): "start-new-session" : sns, "connect" : True, } + #we have consumed the start[-child] options + app.start_child_new_commands = [] + app.start_new_commands = [] try: conn, display_desc = connect() #UGLY warning: connect will parse the display string, @@ -1419,6 +1422,9 @@ def run_remote_server(error_cb, opts, args, mode, defaults): proxy_args.append(params["display"]) for x in get_start_server_args(opts, compat=True): proxy_args.append(shellquote(x)) + #we have consumed the start[-child] options + opts.start_child = [] + opts.start = [] params["display_as_args"] = proxy_args #and use a proxy subcommand to start the server: params["proxy_command"] = [{