Imported Upstream version 3.28.3

[platform/upstream/python-gobject.git] / gi / _ossighelper.py

diff --git a/gi/_ossighelper.py b/gi/_ossighelper.py
index 2c72134..6874068 100644 (file)
--- a/gi/_ossighelper.py
+++ b/gi/_ossighelper.py
@@ -237,8 +237,9 @@ def register_sigint_fallback(callback):
             try:
                 yield
             finally:
+                cb = _callback_stack.pop()
                 if _sigint_called:
-                    _callback_stack.pop()()
+                    cb()
         else:
             # There is a signal handler set by the user, just do nothing
             yield
@@ -255,9 +256,11 @@ def register_sigint_fallback(callback):
         _callback_stack.pop()()
 
     _callback_stack.append(callback)
-    with sigint_handler_set_and_restore_default(sigint_handler):
-        try:
+    try:
+        with sigint_handler_set_and_restore_default(sigint_handler):
             yield
-        finally:
-            if _sigint_called:
-                signal.default_int_handler()
+    finally:
+        if _sigint_called:
+            signal.default_int_handler(signal.SIGINT, None)
+        else:
+            _callback_stack.pop()