From 5d0cd8659bcddd5ecd4fb7797c93d57dec343cda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20J=2E=20Est=C3=A9banez?= Date: Thu, 25 Aug 2022 08:42:34 +0200 Subject: [PATCH] Fix forwarding of CLI arguments taking an option (cherry picked from commit 335a4099dedd950c5b6d45f6b1b1a464bf39341e) --- main/main.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/main/main.cpp b/main/main.cpp index b73d3526e65..f241f7fe15d 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -509,10 +509,12 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph forwardable_cli_arguments[CLI_SCOPE_TOOL].push_back(I->get()); forwardable_cli_arguments[CLI_SCOPE_PROJECT].push_back(I->get()); } - if (I->get() == "--single-window" || - I->get() == "--audio-driver" || + if (I->get() == "--audio-driver" || I->get() == "--video-driver") { - forwardable_cli_arguments[CLI_SCOPE_TOOL].push_back(I->get()); + if (I->next()) { + forwardable_cli_arguments[CLI_SCOPE_TOOL].push_back(I->get()); + forwardable_cli_arguments[CLI_SCOPE_TOOL].push_back(I->next()->get()); + } } #endif