1 files changed, 46 insertions, 15 deletions
diff --git a/modules/mono/editor/godotsharp_editor.cpp b/modules/mono/editor/godotsharp_editor.cpp
index ebfbdafeaf..39c57ee0be 100644
--- a/modules/mono/editor/godotsharp_editor.cpp
+++ b/modules/mono/editor/godotsharp_editor.cpp
@@ -46,21 +46,6 @@
 #include "../utils/mono_reg_utils.h"
 #endif
 
-class MonoReloadNode : public Node {
-	GDCLASS(MonoReloadNode, Node)
-
-protected:
-	void _notification(int p_what) {
-		switch (p_what) {
-			case MainLoop::NOTIFICATION_WM_FOCUS_IN: {
-				CSharpLanguage::get_singleton()->reload_assemblies_if_needed(true);
-			} break;
-			default: {
-			} break;
-		};
-	}
-};
-
 GodotSharpEditor *GodotSharpEditor::singleton = NULL;
 
 bool GodotSharpEditor::_create_project_solution() {
@@ -258,3 +243,49 @@ GodotSharpEditor::~GodotSharpEditor() {
 		monodevel_instance = NULL;
 	}
 }
+
+MonoReloadNode *MonoReloadNode::singleton = NULL;
+
+void MonoReloadNode::_reload_timer_timeout() {
+
+	CSharpLanguage::get_singleton()->reload_assemblies_if_needed(false);
+}
+
+void MonoReloadNode::restart_reload_timer() {
+
+	reload_timer->stop();
+	reload_timer->start();
+}
+
+void MonoReloadNode::_bind_methods() {
+
+	ClassDB::bind_method(D_METHOD("_reload_timer_timeout"), &MonoReloadNode::_reload_timer_timeout);
+}
+
+void MonoReloadNode::_notification(int p_what) {
+	switch (p_what) {
+		case MainLoop::NOTIFICATION_WM_FOCUS_IN: {
+			restart_reload_timer();
+			CSharpLanguage::get_singleton()->reload_assemblies_if_needed(true);
+		} break;
+		default: {
+		} break;
+	};
+}
+
+MonoReloadNode::MonoReloadNode() {
+
+	singleton = this;
+
+	reload_timer = memnew(Timer);
+	add_child(reload_timer);
+	reload_timer->set_one_shot(false);
+	reload_timer->set_wait_time(EDITOR_DEF("mono/assembly_watch_interval_sec", 0.5));
+	reload_timer->connect("timeout", this, "_reload_timer_timeout");
+	reload_timer->start();
+}
+
+MonoReloadNode::~MonoReloadNode() {
+
+	singleton = NULL;
+}