1 files changed, 21 insertions, 23 deletions

diff --git a/modules/mono/editor/mono_bottom_panel.cpp b/modules/mono/editor/mono_bottom_panel.cpp
index 43689548b5..1b5a303835 100644
--- a/modules/mono/editor/mono_bottom_panel.cpp
+++ b/modules/mono/editor/mono_bottom_panel.cpp
@@ -142,7 +142,7 @@ void MonoBottomPanel::_errors_toggled(bool p_pressed) {
 
 void MonoBottomPanel::_build_project_pressed() {
 
-	GodotSharpBuilds::get_singleton()->build_project_blocking();
+	GodotSharpBuilds::get_singleton()->build_project_blocking("Tools");
 
 	MonoReloadNode::get_singleton()->restart_reload_timer();
 	CSharpLanguage::get_singleton()->reload_assemblies_if_needed(true);
@@ -197,7 +197,7 @@ MonoBottomPanel::MonoBottomPanel(EditorNode *p_editor) {
 		toolbar_hbc->set_h_size_flags(SIZE_EXPAND_FILL);
 		panel_builds_tab->add_child(toolbar_hbc);
 
-		ToolButton *build_project_btn = memnew(ToolButton);
+		Button *build_project_btn = memnew(Button);
 		build_project_btn->set_text(TTR("Build Project"));
 		build_project_btn->set_focus_mode(FOCUS_NONE);
 		build_project_btn->connect("pressed", this, "_build_project_pressed");
@@ -335,16 +335,14 @@ void MonoBuildTab::_update_issues_list() {
 
 Ref<Texture> MonoBuildTab::get_icon_texture() const {
 
-	// FIXME these icons were removed... find something better
-
 	if (build_exited) {
 		if (build_result == RESULT_ERROR) {
-			return get_icon("DependencyChangedHl", "EditorIcons");
+			return get_icon("StatusError", "EditorIcons");
 		} else {
-			return get_icon("DependencyOkHl", "EditorIcons");
+			return get_icon("StatusSuccess", "EditorIcons");
 		}
 	} else {
-		return get_icon("GraphTime", "EditorIcons");
+		return get_icon("Stop", "EditorIcons");
 	}
 }
 
@@ -409,9 +407,14 @@ void MonoBuildTab::stop_build() {
 
 void MonoBuildTab::_issue_activated(int p_idx) {
 
-	ERR_FAIL_INDEX(p_idx, issues.size());
+	ERR_FAIL_INDEX(p_idx, issues_list->get_item_count());
+
+	// Get correct issue idx from issue list
+	int issue_idx = this->issues_list->get_item_metadata(p_idx);
+
+	ERR_FAIL_INDEX(issue_idx, issues.size());
 
-	const BuildIssue &issue = issues[p_idx];
+	const BuildIssue &issue = issues[issue_idx];
 
 	if (issue.project_file.empty() && issue.file.empty())
 		return;
@@ -439,21 +442,16 @@ void MonoBuildTab::_bind_methods() {
 	ClassDB::bind_method("_issue_activated", &MonoBuildTab::_issue_activated);
 }
 
-MonoBuildTab::MonoBuildTab(const MonoBuildInfo &p_build_info, const String &p_logs_dir) {
-
-	build_info = p_build_info;
-	logs_dir = p_logs_dir;
-
-	build_exited = false;
-
-	issues_list = memnew(ItemList);
+MonoBuildTab::MonoBuildTab(const MonoBuildInfo &p_build_info, const String &p_logs_dir) :
+		build_info(p_build_info),
+		logs_dir(p_logs_dir),
+		build_exited(false),
+		issues_list(memnew(ItemList)),
+		error_count(0),
+		warning_count(0),
+		errors_visible(true),
+		warnings_visible(true) {
 	issues_list->set_v_size_flags(SIZE_EXPAND_FILL);
 	issues_list->connect("item_activated", this, "_issue_activated");
 	add_child(issues_list);
-
-	error_count = 0;
-	warning_count = 0;
-
-	errors_visible = true;
-	warnings_visible = true;
 }