godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Godot returned status code on unexpected error

Browse Source
This commit is contained in:
Emmanuel Leblond 2020-05-21 18:08:48 +02:00
parent ee5ea64e83
commit 0e4abcb77f
No known key found for this signature in database
GPG Key ID: C360860E645EFFC0
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/os/os.cpp
View File

@ -226,6 +226,11 @@ int OS::get_exit_code() const {
void OS::set_exit_code(int p_code) { void OS::set_exit_code(int p_code) {
_exit_code = p_code; _exit_code = p_code;
_is_custom_exit_code = true;
}
bool OS::is_custom_exit_code() {
return _is_custom_exit_code;
} }
String OS::get_locale() const { String OS::get_locale() const {

5
core/os/os.h
View File

@ -40,6 +40,7 @@
#include "core/templates/vector.h" #include "core/templates/vector.h"
#include <stdarg.h> #include <stdarg.h>
#include <stdlib.h>
class OS { class OS {
static OS *singleton; static OS *singleton;
@ -53,7 +54,8 @@ class OS {
bool _debug_stdout = false; bool _debug_stdout = false;
String _local_clipboard; String _local_clipboard;
bool _no_window = false; bool _no_window = false;
int _exit_code = 0; int _exit_code = EXIT_FAILURE; // unexpected exit is marked as failure
bool _is_custom_exit_code = false;
int _orientation; int _orientation;
bool _allow_hidpi = false; bool _allow_hidpi = false;
bool _allow_layered = false; bool _allow_layered = false;
@ -268,6 +270,7 @@ public:
virtual int get_exit_code() const; virtual int get_exit_code() const;
virtual void set_exit_code(int p_code); virtual void set_exit_code(int p_code);
virtual bool is_custom_exit_code();
virtual int get_processor_count() const; virtual int get_processor_count() const;

4
scene/main/scene_tree.cpp
View File

@ -54,6 +54,7 @@
#include "window.h" #include "window.h"
#include <stdio.h> #include <stdio.h>
#include <stdlib.h>
void SceneTreeTimer::_bind_methods() { void SceneTreeTimer::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_time_left", "time"), &SceneTreeTimer::set_time_left); ClassDB::bind_method(D_METHOD("set_time_left", "time"), &SceneTreeTimer::set_time_left);
@ -538,6 +539,9 @@ void SceneTree::quit(int p_exit_code) {
// Override the exit code if a positive argument is given (the default is `-1`). // Override the exit code if a positive argument is given (the default is `-1`).
// This is a shorthand for calling `set_exit_code()` on the OS singleton then quitting. // This is a shorthand for calling `set_exit_code()` on the OS singleton then quitting.
OS::get_singleton()->set_exit_code(p_exit_code); OS::get_singleton()->set_exit_code(p_exit_code);
} else if (!OS::get_singleton()->is_custom_exit_code()) {
// Must customize exit code, otherwise it will default to a non-zero value
OS::get_singleton()->set_exit_code(EXIT_SUCCESS);
} }
_quit = true; _quit = true;