summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorRémi Verschelde <remi@verschelde.fr>2016-01-18 14:44:49 +0100
committerRémi Verschelde <remi@verschelde.fr>2016-01-18 14:44:49 +0100
commit7e20c86ac71d27cc45e6a38feedc3037e8b0e8cd (patch)
tree037fae34110891cff0cdf6fc3c22457da25f2ea3 /main
parentc0b9634235ee67415506b5a75a6bd7bb5ef28f21 (diff)
parent4563a5909ae617e458ac4484bfd5229252c2bae8 (diff)
Merge pull request #3360 from volzhs/keep-screen-on-5
Add ability to set "keep screen on" for android & iOS. fixes #2428
Diffstat (limited to 'main')
-rw-r--r--main/main.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/main/main.cpp b/main/main.cpp
index 8319c415fc..19fe037613 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -707,6 +707,7 @@ Error Main::setup(const char *execpath,int argc, char *argv[],bool p_second_phas
GLOBAL_DEF("display/test_width",0);
GLOBAL_DEF("display/test_height",0);
OS::get_singleton()->_pixel_snap=GLOBAL_DEF("display/use_2d_pixel_snap",false);
+ OS::get_singleton()->_keep_screen_on=GLOBAL_DEF("display/keep_screen_on",true);
if (rtm==-1) {
rtm=GLOBAL_DEF("render/thread_model",OS::RENDER_THREAD_SAFE);
if (rtm>=1) //hack for now