From 1577f4165374fc7c6d7f3031e463f0aab6e96faa Mon Sep 17 00:00:00 2001
From: "Wilson E. Alvarez" <wilson.e.alvarez1@gmail.com>
Date: Thu, 24 Aug 2017 12:51:28 -0400
Subject: Fixed several memory leaks

---
 editor/editor_help.cpp                       |  1 -
 editor/editor_node.cpp                       | 15 +--------------
 editor/editor_settings.cpp                   |  2 ++
 editor/plugins/canvas_item_editor_plugin.cpp |  4 ++++
 editor/plugins/canvas_item_editor_plugin.h   |  1 +
 editor/script_create_dialog.cpp              |  3 +++
 6 files changed, 11 insertions(+), 15 deletions(-)

(limited to 'editor')

diff --git a/editor/editor_help.cpp b/editor/editor_help.cpp
index 86f31d7589..6edfcb7fd2 100644
--- a/editor/editor_help.cpp
+++ b/editor/editor_help.cpp
@@ -294,7 +294,6 @@ EditorHelpSearch::EditorHelpSearch() {
 	VBoxContainer *vbc = memnew(VBoxContainer);
 	add_child(vbc);
 
-	HBoxContainer *sb_hb = memnew(HBoxContainer);
 	search_box = memnew(LineEdit);
 	vbc->add_child(search_box);
 	search_box->connect("text_changed", this, "_text_changed");
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp
index 86964b3ca0..34d0ff9aed 100644
--- a/editor/editor_node.cpp
+++ b/editor/editor_node.cpp
@@ -5645,21 +5645,7 @@ EditorNode::EditorNode() {
 	progress_hb = memnew(BackgroundProgress);
 	//menu_hb->add_child(progress_hb);
 
-	{
-		Control *sp = memnew(Control);
-		sp->set_custom_minimum_size(Size2(30, 0) * EDSCALE);
-		//menu_hb->add_child(sp);
-	}
-
-	{
-		Control *sp = memnew(Control);
-		sp->set_custom_minimum_size(Size2(30, 0) * EDSCALE);
-		//menu_hb->add_child(sp);
-	}
-
-	top_region = memnew(PanelContainer);
 	HBoxContainer *right_menu_hb = memnew(HBoxContainer);
-	//top_region->add_child(right_menu_hb);
 	menu_hb->add_child(right_menu_hb);
 
 	layout_dialog = memnew(EditorNameDialog);
@@ -6242,6 +6228,7 @@ EditorNode::~EditorNode() {
 	memdelete(editor_plugins_over);
 	memdelete(editor_plugins_force_input_forwarding);
 	memdelete(file_server);
+	memdelete(progress_hb);
 	EditorSettings::destroy();
 }
 
diff --git a/editor/editor_settings.cpp b/editor/editor_settings.cpp
index 358d575764..d14443e7cb 100644
--- a/editor/editor_settings.cpp
+++ b/editor/editor_settings.cpp
@@ -253,6 +253,7 @@ static void _create_script_templates(const String &p_path) {
 		}
 	}
 
+	memdelete(dir);
 	memdelete(file);
 }
 
@@ -280,6 +281,7 @@ void EditorSettings::create() {
 		self_contained = true;
 		extra_config->load(exe_path + "/_sc_");
 	}
+	memdelete(d);
 
 	if (self_contained) {
 		// editor is self contained
diff --git a/editor/plugins/canvas_item_editor_plugin.cpp b/editor/plugins/canvas_item_editor_plugin.cpp
index 79bf68b061..b5c237a61c 100644
--- a/editor/plugins/canvas_item_editor_plugin.cpp
+++ b/editor/plugins/canvas_item_editor_plugin.cpp
@@ -4114,3 +4114,7 @@ CanvasItemEditorViewport::CanvasItemEditorViewport(EditorNode *p_node, CanvasIte
 	label_desc->hide();
 	editor->get_gui_base()->add_child(label_desc);
 }
+
+CanvasItemEditorViewport::~CanvasItemEditorViewport() {
+	memdelete(preview);
+}
diff --git a/editor/plugins/canvas_item_editor_plugin.h b/editor/plugins/canvas_item_editor_plugin.h
index 9b027fda60..0291660d42 100644
--- a/editor/plugins/canvas_item_editor_plugin.h
+++ b/editor/plugins/canvas_item_editor_plugin.h
@@ -512,6 +512,7 @@ public:
 	virtual void drop_data(const Point2 &p_point, const Variant &p_data);
 
 	CanvasItemEditorViewport(EditorNode *p_node, CanvasItemEditor *p_canvas);
+	~CanvasItemEditorViewport();
 };
 
 #endif
diff --git a/editor/script_create_dialog.cpp b/editor/script_create_dialog.cpp
index 299538a2b3..b70c63c97c 100644
--- a/editor/script_create_dialog.cpp
+++ b/editor/script_create_dialog.cpp
@@ -591,6 +591,9 @@ ScriptCreateDialog::ScriptCreateDialog() {
 	hb->add_child(vb);
 	hb->add_child(empty_v->duplicate());
 
+	memdelete(empty_h);
+	memdelete(empty_v);
+
 	add_child(hb);
 
 	/* Language */
-- 
cgit v1.2.3