Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2024-10-19 22:01:33 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2024-10-21 10:13:25 +0200
commite7c2b6ea1645065a64c2385498e7bd452e47c1ec (patch)
treed816727d6ec7c61a3560e58826f942e63d39be4a /sources/pyside6/libpyside/signalmanager.cpp
parentbdd6a0d5d61aa76c202669ae1c17ef4dfe0b9bde (diff)
Fix error handling in non-slot connection receivers
Extract the error handling code which existed duplicated in GlobalReceiverV2::qt_metacall() and SignalManagerPrivate::handleMetaCallError() as a static helper of SignalManager and call that from the DynamicSlot functions. Amends 33bd61d13d8d9e3794b6049891be62f3351313d9. Pick-to: 6.8 6.8.0 Task-number: PYSIDE-2810 Fixes: PYSIDE-2900 Change-Id: Ife9f156e6752dde7002218d36d369ba68ad595b0 Reviewed-by: Christian Tismer <tismer@stackless.com>
Diffstat (limited to 'sources/pyside6/libpyside/signalmanager.cpp')
-rw-r--r--sources/pyside6/libpyside/signalmanager.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/sources/pyside6/libpyside/signalmanager.cpp b/sources/pyside6/libpyside/signalmanager.cpp
index 35116648b..c3d66f3bc 100644
--- a/sources/pyside6/libpyside/signalmanager.cpp
+++ b/sources/pyside6/libpyside/signalmanager.cpp
@@ -300,7 +300,11 @@ void SignalManagerPrivate::handleMetaCallError(QObject *object, int *result)
if (idOpt.has_value())
*result = idOpt.value();
}
+ SignalManager::handleMetaCallError();
+}
+void SignalManager::handleMetaCallError()
+{
const int reclimit = Py_GetRecursionLimit();
// Inspired by Python's errors.c: PyErr_GivenExceptionMatches() function.
// Temporarily bump the recursion limit, so that PyErr_Print will not raise a recursion