From 531c3401e4ead91118e33610c97128efdc786a53 Mon Sep 17 00:00:00 2001 From: Aleksey Manevich Date: Mon, 1 Aug 2016 16:21:35 +0300 Subject: change order of arguments to Xephyr to allow override --- src/firejail/x11.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/firejail/x11.c b/src/firejail/x11.c index c284bb882..090ff6f3b 100644 --- a/src/firejail/x11.c +++ b/src/firejail/x11.c @@ -190,11 +190,11 @@ void x11_start_xephyr(int argc, char **argv) { // start xephyr char *cmd1; if (checkcfg(CFG_XEPHYR_WINDOW_TITLE)) { - if (asprintf(&cmd1, "Xephyr -ac -br -title \"firejail x11 sandbox\" %s -terminate -screen %s :%d", xephyr_extra_params, xephyr_screen, display) == -1) + if (asprintf(&cmd1, "Xephyr -ac -br -title \"firejail x11 sandbox\" -terminate -screen %s %s :%d", xephyr_screen, xephyr_extra_params, display) == -1) errExit("asprintf"); } else { - if (asprintf(&cmd1, "Xephyr -ac -br %s -terminate -screen %s :%d", xephyr_extra_params, xephyr_screen, display) == -1) + if (asprintf(&cmd1, "Xephyr -ac -br -terminate -screen %s %s :%d", xephyr_screen, xephyr_extra_params, display) == -1) errExit("asprintf"); } -- cgit v1.2.3-70-g09d2