Fix Connection dock's popups always allowing disconnect

godotengine · Sep 16, 2023 · 4471e7f · 4471e7f
1 parent 5f1e56f
commit 4471e7f
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/editor/connections_dialog.cpp b/editor/connections_dialog.cpp
@@ -1213,6 +1213,11 @@ void ConnectionsDock::_rmb_pressed(const Ref<InputEvent> &p_event) {
 		return;
 	}
 
+	if (item->is_selectable(0)) {
+		// Update selection now, before `about_to_popup` signal. Needed for SIGNAL and CONNECTION context menus.
+		tree->set_selected(item);
+	}
+
 	Vector2 screen_position = tree->get_screen_position() + mb_event->get_position();
 
 	switch (_get_item_type(*item)) {