Improve signal handling in Popup (fixes godotengine#87626)

kii-chan-reloaded · Aug 3, 2024 · bdb03ef · bdb03ef
1 parent 9492f45
commit bdb03ef
Showing 1 changed file with 24 additions and 9 deletions.
diff --git a/scene/gui/popup.cpp b/scene/gui/popup.cpp
@@ -45,25 +45,40 @@ void Popup::_input_from_window(const Ref<InputEvent> &p_event) {
 
 void Popup::_initialize_visible_parents() {
 	if (is_embedded()) {
-		visible_parents.clear();
+		// Ensure no connections are left dangling before we create new ones
+		this->_deinitialize_visible_parents();
 
-		Window *parent_window = this;
+		Window *parent_window = this->get_parent_visible_window();
 		while (parent_window) {
-			parent_window = parent_window->get_parent_visible_window();
-			if (parent_window) {
-				visible_parents.push_back(parent_window);
-				parent_window->connect(SceneStringName(focus_entered), callable_mp(this, &Popup::_parent_focused));
-				parent_window->connect(SceneStringName(tree_exited), callable_mp(this, &Popup::_deinitialize_visible_parents));
+			visible_parents.push_back(parent_window);
+
+			Callable focus_entered_callable = callable_mp(this, &Popup::_parent_focused);
+			Callable tree_exited_callable = callable_mp(this, &Popup::_deinitialize_visible_parents);
+
+			if (!parent_window->is_connected(SceneStringName(focus_entered), focus_entered_callable)) {
+				parent_window->connect(SceneStringName(focus_entered), focus_entered_callable);
 			}
+			if (!parent_window->is_connected(SceneStringName(tree_exited), tree_exited_callable)) {
+				parent_window->connect(SceneStringName(tree_exited), tree_exited_callable);
+			}
+
+			parent_window = parent_window->get_parent_visible_window();
 		}
 	}
 }
 
 void Popup::_deinitialize_visible_parents() {
 	if (is_embedded()) {
 		for (Window *parent_window : visible_parents) {
-			parent_window->disconnect(SceneStringName(focus_entered), callable_mp(this, &Popup::_parent_focused));
-			parent_window->disconnect(SceneStringName(tree_exited), callable_mp(this, &Popup::_deinitialize_visible_parents));
+			Callable focus_entered_callable = callable_mp(this, &Popup::_parent_focused);
+                        Callable tree_exited_callable = callable_mp(this, &Popup::_deinitialize_visible_parents);
+
+                        if (parent_window->is_connected(SceneStringName(focus_entered), focus_entered_callable)) {
+                                parent_window->disconnect(SceneStringName(focus_entered), focus_entered_callable);
+                        }
+                        if (parent_window->is_connected(SceneStringName(tree_exited), tree_exited_callable)) {
+                                parent_window->disconnect(SceneStringName(tree_exited), tree_exited_callable);
+                        }
 		}
 
 		visible_parents.clear();