From db455e5beef95b067bba0a534848f4555067a42b Mon Sep 17 00:00:00 2001
From: A Thousand Ships <96648715+AThousandShips@users.noreply.github.com>
Date: Wed, 13 Mar 2024 17:57:22 +0100
Subject: [Core] Disconnect one-shot signals before calling callbacks

This prevents infinite recursion with one-shot connections emitting
themselves
---
 .../scripts/runtime/features/emit_after_await.gd   | 12 ++++++++++++
 .../scripts/runtime/features/emit_after_await.out  |  1 +
 .../features/emit_one_shot_is_non_recursive.gd     | 22 ++++++++++++++++++++++
 .../features/emit_one_shot_is_non_recursive.out    |  5 +++++
 4 files changed, 40 insertions(+)
 create mode 100644 modules/gdscript/tests/scripts/runtime/features/emit_after_await.gd
 create mode 100644 modules/gdscript/tests/scripts/runtime/features/emit_after_await.out
 create mode 100644 modules/gdscript/tests/scripts/runtime/features/emit_one_shot_is_non_recursive.gd
 create mode 100644 modules/gdscript/tests/scripts/runtime/features/emit_one_shot_is_non_recursive.out

(limited to 'modules/gdscript/tests/scripts')

diff --git a/modules/gdscript/tests/scripts/runtime/features/emit_after_await.gd b/modules/gdscript/tests/scripts/runtime/features/emit_after_await.gd
new file mode 100644
index 0000000000..21fd526acc
--- /dev/null
+++ b/modules/gdscript/tests/scripts/runtime/features/emit_after_await.gd
@@ -0,0 +1,12 @@
+# https://github.com/godotengine/godot/issues/89439
+extends Node
+
+signal my_signal
+
+func async_func():
+	await my_signal
+	my_signal.emit()
+
+func test():
+	async_func()
+	my_signal.emit()
diff --git a/modules/gdscript/tests/scripts/runtime/features/emit_after_await.out b/modules/gdscript/tests/scripts/runtime/features/emit_after_await.out
new file mode 100644
index 0000000000..d73c5eb7cd
--- /dev/null
+++ b/modules/gdscript/tests/scripts/runtime/features/emit_after_await.out
@@ -0,0 +1 @@
+GDTEST_OK
diff --git a/modules/gdscript/tests/scripts/runtime/features/emit_one_shot_is_non_recursive.gd b/modules/gdscript/tests/scripts/runtime/features/emit_one_shot_is_non_recursive.gd
new file mode 100644
index 0000000000..5c328dcfcd
--- /dev/null
+++ b/modules/gdscript/tests/scripts/runtime/features/emit_one_shot_is_non_recursive.gd
@@ -0,0 +1,22 @@
+# https://github.com/godotengine/godot/issues/89439
+
+signal my_signal
+
+func foo():
+	print("Foo")
+	my_signal.emit()
+
+func bar():
+	print("Bar")
+
+func baz():
+	print("Baz")
+
+func test():
+	@warning_ignore("return_value_discarded")
+	my_signal.connect(foo, CONNECT_ONE_SHOT)
+	@warning_ignore("return_value_discarded")
+	my_signal.connect(bar, CONNECT_ONE_SHOT)
+	@warning_ignore("return_value_discarded")
+	my_signal.connect(baz)
+	my_signal.emit()
diff --git a/modules/gdscript/tests/scripts/runtime/features/emit_one_shot_is_non_recursive.out b/modules/gdscript/tests/scripts/runtime/features/emit_one_shot_is_non_recursive.out
new file mode 100644
index 0000000000..3399e08878
--- /dev/null
+++ b/modules/gdscript/tests/scripts/runtime/features/emit_one_shot_is_non_recursive.out
@@ -0,0 +1,5 @@
+GDTEST_OK
+Foo
+Baz
+Bar
+Baz
-- 
cgit v1.2.3