Version 2.0.4.1, hotfix for #5620

Fixes a bug that happens on Windows 64-bits.

(cherry picked from commit 2c6d0d4905)

drivers/builtin_openssl2/openssl/opensslconf.h

@@ -213,8 +213,13 @@ extern "C" {
 
 #ifdef OPENSSL_USE_64_BITS
 
-#define SIXTY_FOUR_BIT_LONG
-#undef SIXTY_FOUR_BIT
+# ifdef _WIN32
+#  undef SIXTY_FOUR_BIT_LONG
+#  define SIXTY_FOUR_BIT
+# else
+#  define SIXTY_FOUR_BIT_LONG
+#  undef SIXTY_FOUR_BIT
+# endif
 #undef THIRTY_TWO_BIT
 
 #else

main/main.cpp

@@ -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)

platform/windows/joystick.cpp

@@ -281,7 +281,7 @@ void joystick_windows::close_joystick(int id) {
 	d_joysticks[id].attached = false;
 	attached_joysticks[d_joysticks[id].id] = false;
 	d_joysticks[id].guid.Data1 = d_joysticks[id].guid.Data2 = d_joysticks[id].guid.Data3 = 0;
-	input->joy_connection_changed(id, false, "");
+	input->joy_connection_changed(d_joysticks[id].id, false, "");
 	joystick_count--;
 }
 

tools/editor/editor_dir_dialog.cpp

@@ -30,7 +30,6 @@
 #include "os/os.h"
 #include "os/keyboard.h"
 #include "tools/editor/editor_settings.h"
-#include "tools/editor/editor_file_system.h"
 
 
 void EditorDirDialog::_update_dir(TreeItem* p_item) {
@@ -87,14 +86,11 @@ void EditorDirDialog::reload() {
 	_item_collapsed(root);
 }
 
-
 void EditorDirDialog::_notification(int p_what) {
 
 	if (p_what==NOTIFICATION_ENTER_TREE) {
 		reload();
 		tree->connect("item_collapsed",this,"_item_collapsed",varray(),CONNECT_DEFERRED);
-		EditorFileSystem::get_singleton()->connect("filesystem_changed",this,"reload");
-
 	}
 }
 
@@ -202,7 +198,6 @@ void EditorDirDialog::_bind_methods() {
 	ObjectTypeDB::bind_method(_MD("_item_collapsed"),&EditorDirDialog::_item_collapsed);
 	ObjectTypeDB::bind_method(_MD("_make_dir"),&EditorDirDialog::_make_dir);
 	ObjectTypeDB::bind_method(_MD("_make_dir_confirm"),&EditorDirDialog::_make_dir_confirm);
-	ObjectTypeDB::bind_method(_MD("reload"),&EditorDirDialog::reload);
 
 	ADD_SIGNAL(MethodInfo("dir_selected",PropertyInfo(Variant::STRING,"dir")));
 }
@@ -243,6 +238,4 @@ EditorDirDialog::EditorDirDialog() {
 
 	get_ok()->set_text("Choose");
 
-
-
 }

tools/editor/editor_dir_dialog.h

@@ -53,8 +53,6 @@ class EditorDirDialog : public ConfirmationDialog {
 	void _make_dir_confirm();
 
 	void ok_pressed();
-
-
 protected:
 
 	void _notification(int p_what);

tools/editor/editor_help.cpp

@@ -331,7 +331,7 @@ EditorHelpSearch::EditorHelpSearch() {
 	register_text_enter(search_box);
 	set_hide_on_ok(false);
 	search_options->connect("item_activated",this,"_confirmed");
-	set_title("Search Classes");
+	set_title("Search Help");
 
 //	search_options->set_hide_root(true);
 
@@ -525,6 +525,7 @@ EditorHelpIndex::EditorHelpIndex() {
 	class_list->connect("item_activated",this,"_tree_item_selected");
 
 	get_ok()->set_text("Open");
+	set_title("Search Classes");
 }
 
 

tools/editor/plugins/script_editor_plugin.cpp

@@ -838,6 +838,15 @@ void ScriptEditor::_reload_scripts(){
 		}
 
 
+		uint64_t last_date = script->get_last_modified_time();
+		uint64_t date = FileAccess::get_modified_time(script->get_path());
+
+		//printf("last date: %lli vs date: %lli\n",last_date,date);
+		if (last_date==date) {
+			continue;
+		}
+
+
 		Ref<Script> rel_script = ResourceLoader::load(script->get_path(),script->get_type(),true);
 		ERR_CONTINUE(!rel_script.is_valid());
 		script->set_source_code( rel_script->get_source_code() );

version.py

@@ -2,5 +2,5 @@ short_name="godot"
 name="Godot Engine"
 major=2
 minor=0
-patch=4
+patch=4.1
 status="stable"