diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2016-06-18 16:03:00 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2016-06-18 16:03:35 -0300 |
| commit | 5e7f1fc79b03f0c1eb9877ff82f24b921d2c43ea (patch) | |
| tree | 42a5f376231912c7d7a81c895804a7eebd9295ba /main/main.cpp | |
| parent | 81a10795dc3c88331e211d80ac13baea41b11d77 (diff) | |
update EditorDirDialog on external change, closes #4629
Diffstat (limited to 'main/main.cpp')
| -rw-r--r-- | main/main.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/main/main.cpp b/main/main.cpp index 6cddea823a..de212deefd 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -110,6 +110,7 @@ static bool use_debug_profiler=false; static bool force_lowdpi=false; static int init_screen=-1; static bool use_vsync=true; +static bool editor=false; static String unescape_cmdline(const String& p_str) { @@ -281,7 +282,7 @@ Error Main::setup(const char *execpath,int argc, char *argv[],bool p_second_phas packed_data->add_pack_source(zip_packed_data); #endif - bool editor=false; + while(I) { @@ -953,7 +954,7 @@ Error Main::setup2() { Globals::get_singleton()->set_custom_property_info("application/icon",PropertyInfo(Variant::STRING,"application/icon",PROPERTY_HINT_FILE,"*.png,*.webp")); if (bool(GLOBAL_DEF("display/emulate_touchscreen",false))) { - if (!OS::get_singleton()->has_touchscreen_ui_hint() && Input::get_singleton()) { + if (!OS::get_singleton()->has_touchscreen_ui_hint() && Input::get_singleton() && !editor) { //only if no touchscreen ui hint, set emulation InputDefault *id = Input::get_singleton()->cast_to<InputDefault>(); if (id) |