godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-06 10:11:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

Revert "update EditorDirDialog on external change, closes #4629"

Browse Source 
This reverts commit 257d370677.
Fixes #5620.
This commit is contained in:
Rémi Verschelde
2016-07-10 10:15:13 +02:00
parent 7ce99c23dd
commit 5184b215a9
3 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
main/main.cpp
View File

@@ -107,7 +107,6 @@ static String locale;
static int init_screen=-1;
static bool editor=false;
static String unescape_cmdline(const String& p_str) {
@@ -276,7 +275,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) {
@@ -932,7 +931,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() && !editor) {
if (!OS::get_singleton()->has_touchscreen_ui_hint() && Input::get_singleton()) {
//only if no touchscreen ui hint, set emulation
InputDefault *id = Input::get_singleton()->cast_to<InputDefault>();
if (id)