summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Verschelde <remi@verschelde.fr>2022-08-25 17:55:46 +0200
committerGitHub <noreply@github.com>2022-08-25 17:55:46 +0200
commit03f6a9d88ef3926e1d684918353c24307d829eb4 (patch)
treed5dfa9772b13bb5bc3bf6d2f2af9378875ffa5ab
parent78033235bb36063962d7729a0d21e3f377ba9109 (diff)
parent335a4099dedd950c5b6d45f6b1b1a464bf39341e (diff)
Merge pull request #64874 from RandomShaper/fix_cli_forwarding
-rw-r--r--main/main.cpp11
1 files changed, 8 insertions, 3 deletions
diff --git a/main/main.cpp b/main/main.cpp
index 8a25827e02..126ac59070 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -725,11 +725,16 @@ 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() == "--single-window") {
+ forwardable_cli_arguments[CLI_SCOPE_TOOL].push_back(I->get());
+ }
+ if (I->get() == "--audio-driver" ||
I->get() == "--display-driver" ||
I->get() == "--rendering-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