diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-06-30 14:36:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-30 14:36:43 +0200 |
| commit | e7197cb6f985eaa0a898ed1b0991d88db2f1312b (patch) | |
| tree | dd6f17f0a80d62677915f08285e0ddabba3a9839 | |
| parent | 1e082914e2d8270a415f1408c8e56d4adf520df4 (diff) | |
| parent | e3a8edf536ab8115594b0d6c3efa0603e71825ad (diff) | |
Merge pull request #62550 from Bromeon/bugfix/cli-version-ok
| -rw-r--r-- | main/main.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/main/main.cpp b/main/main.cpp index f3c56c7205..00b7483406 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -673,6 +673,9 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph packed_data->add_pack_source(zip_packed_data); #endif + // Default exit code, can be modified for certain errors. + Error exit_code = ERR_INVALID_PARAMETER; + I = args.front(); while (I) { #ifdef OSX_ENABLED @@ -688,10 +691,12 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph if (I->get() == "-h" || I->get() == "--help" || I->get() == "/?") { // display help show_help = true; + exit_code = OK; goto error; } else if (I->get() == "--version") { print_line(get_full_version_string()); + exit_code = OK; goto error; } else if (I->get() == "-v" || I->get() == "--verbose") { // verbose output @@ -1636,7 +1641,7 @@ error: OS::get_singleton()->finalize_core(); locale = String(); - return ERR_INVALID_PARAMETER; + return exit_code; } Error Main::setup2(Thread::ID p_main_tid_override) { |