aboutsummaryrefslogtreecommitdiffstats
path: root/sources/pyside6/PySide6/glue
diff options
context:
space:
mode:
authorAdrian Herrmann <adrian.herrmann@qt.io>2024-05-15 19:50:26 +0200
committerAdrian Herrmann <adrian.herrmann@qt.io>2024-05-27 15:29:10 +0200
commit36e2078d25e09c360e150dbbab4c20a4f03552c7 (patch)
treea4b64da05bdcf55c7aeb286e293875646dd606c4 /sources/pyside6/PySide6/glue
parent7dc9e846720d11864ac162a1da659888a96f2084 (diff)
Fix suppressed exceptions for 0-delay singleShot
Fix an issue where exceptions were not shown when raised inside a slot called from a zero-delay singleshot timer, causing problems further down the line. Pick-to: 6.7 Fixes: PYSIDE-2745 Change-Id: Iab7696663e5dfa00d99d28ee21ac687fde4cf731 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'sources/pyside6/PySide6/glue')
-rw-r--r--sources/pyside6/PySide6/glue/qtcore.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/sources/pyside6/PySide6/glue/qtcore.cpp b/sources/pyside6/PySide6/glue/qtcore.cpp
index fc2fe7a58..0c206db72 100644
--- a/sources/pyside6/PySide6/glue/qtcore.cpp
+++ b/sources/pyside6/PySide6/glue/qtcore.cpp
@@ -1022,6 +1022,8 @@ void QSingleShotTimerFunctor::operator()()
Shiboken::GilState state;
Shiboken::AutoDecRef arglist(PyTuple_New(0));
Shiboken::AutoDecRef ret(PyObject_CallObject(object(), arglist));
+ if (Shiboken::Errors::occurred())
+ Shiboken::Errors::storeErrorOrPrint();
release(); // single shot
}
// @snippet qtimer-singleshot-functorclass