godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-08 12:40:44 +00:00
Code Releases Wiki Activity

Revert "Command line arguments '--version' and '--help' return exit code 0 instead of 255"

Browse Source 
This reverts commit 9e165a8c2b.
See https://github.com/godotengine/godot/pull/62550#issuecomment-1172745325.
This commit is contained in:
Rémi Verschelde
2022-07-02 00:07:14 +02:00
parent ea4aaf9705
commit cc9dd00e1a
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
main/main.cpp
View File

@@ -478,9 +478,6 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
packed_data->add_pack_source(zip_packed_data); packed_data->add_pack_source(zip_packed_data);
#endif #endif
// Default exit code, can be modified for certain errors.
Error exit_code = ERR_INVALID_PARAMETER;
I = args.front(); I = args.front();
while (I) { while (I) {
#ifdef OSX_ENABLED #ifdef OSX_ENABLED
@@ -497,12 +494,10 @@ 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 if (I->get() == "-h" || I->get() == "--help" || I->get() == "/?") { // display help
show_help = true; show_help = true;
exit_code = OK;
goto error; goto error;
} else if (I->get() == "--version") { } else if (I->get() == "--version") {
print_line(get_full_version_string()); print_line(get_full_version_string());
exit_code = OK;
goto error; goto error;
} else if (I->get() == "-v" || I->get() == "--verbose") { // verbose output } else if (I->get() == "-v" || I->get() == "--verbose") { // verbose output
@@ -1333,7 +1328,7 @@ error:
OS::get_singleton()->finalize_core(); OS::get_singleton()->finalize_core();
locale = String(); locale = String();
return exit_code; return ERR_INVALID_PARAMETER;
} }
Error Main::setup2(Thread::ID p_main_tid_override) { Error Main::setup2(Thread::ID p_main_tid_override) {