aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvolzhs2017-04-25 19:54:08 +0900
committervolzhs2017-04-25 19:54:08 +0900
commitedefaa768b861023adc52bc83d50e403ea7143d8 (patch)
tree678b7104a7a01ad2c55f9a3eb14d15406b656bcc
parentea89c56bfbf7ab6f5810c74960f1e5c28da63927 (diff)
downloadgodot-edefaa768b861023adc52bc83d50e403ea7143d8.tar.gz
godot-edefaa768b861023adc52bc83d50e403ea7143d8.tar.zst
godot-edefaa768b861023adc52bc83d50e403ea7143d8.zip
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.
-rw-r--r--scene/main/scene_main_loop.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/main/scene_main_loop.cpp b/scene/main/scene_main_loop.cpp
index 3a000c765..3c14b48ca 100644
--- a/scene/main/scene_main_loop.cpp
+++ b/scene/main/scene_main_loop.cpp
@@ -460,7 +460,6 @@ void SceneTree::input_event(const InputEvent &p_event) {
void SceneTree::init() {
//_quit=false;
- accept_quit = true;
initialized = true;
input_handled = false;
@@ -1625,6 +1624,7 @@ SceneTree::SceneTree() {
singleton = this;
_quit = false;
+ accept_quit = true;
initialized = false;
#ifdef TOOLS_ENABLED
editor_hint = false;