diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-04-26 08:13:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-26 08:13:52 +0200 |
| commit | 1a47087a734c038f20a3733ba8055c9583427c20 (patch) | |
| tree | d7c694c3e32b5ac6f555a323f7ebc9971af2aba4 /scene | |
| parent | cdf0fbd8e83c942b4d16d4bd05af793b2979f826 (diff) | |
| parent | de4267fc992388f9e841a6427436d083166b49e0 (diff) | |
Merge pull request #8530 from volzhs/auto-accept-quit-master
Fix auto_accept_quit option to work
Diffstat (limited to 'scene')
| -rw-r--r-- | scene/main/scene_main_loop.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scene/main/scene_main_loop.cpp b/scene/main/scene_main_loop.cpp index be28479f39..a43938c661 100644 --- a/scene/main/scene_main_loop.cpp +++ b/scene/main/scene_main_loop.cpp @@ -510,8 +510,6 @@ void SceneTree::input_event(const InputEvent &p_event) { void SceneTree::init() { //_quit=false; - accept_quit = true; - quit_on_go_back = true; initialized = true; input_handled = false; @@ -2266,6 +2264,8 @@ SceneTree::SceneTree() { singleton = this; _quit = false; + accept_quit = true; + quit_on_go_back = true; initialized = false; #ifdef TOOLS_ENABLED editor_hint = false; |