Merge pull request #63170 from KoBeWi/main_failed

This commit is contained in:
Rémi Verschelde 2022-07-20 22:33:18 +02:00 committed by GitHub
commit 5db878a76e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1044,10 +1044,9 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
if (I->next()) {
String p = I->next()->get();
if (OS::get_singleton()->set_cwd(p) == OK) {
//nothing
} else {
project_path = I->next()->get(); //use project_path instead
if (OS::get_singleton()->set_cwd(p) != OK) {
OS::get_singleton()->print("Invalid project path specified: \"%s\", aborting.\n", p.utf8().get_data());
goto error;
}
N = I->next()->next();
} else {