Fix auto_accept_quit option to work

auto_accept_quit value is set first properly with GLOBAL_DEF("application/auto_accept_quit", true) in main.cpp
after that it's reset to true in SceneTree:init() whatever value was.
This commit is contained in:
volzhs 2017-04-25 20:05:22 +09:00
parent b6e0eaf3ca
commit de4267fc99

View file

@ -510,8 +510,6 @@ void SceneTree::input_event(const InputEvent &p_event) {
void SceneTree::init() { void SceneTree::init() {
//_quit=false; //_quit=false;
accept_quit = true;
quit_on_go_back = true;
initialized = true; initialized = true;
input_handled = false; input_handled = false;
@ -2266,6 +2264,8 @@ SceneTree::SceneTree() {
singleton = this; singleton = this;
_quit = false; _quit = false;
accept_quit = true;
quit_on_go_back = true;
initialized = false; initialized = false;
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED
editor_hint = false; editor_hint = false;