summaryrefslogtreecommitdiffstats
path: root/src/platformsupport/linuxaccessibility/atspiadaptor.cpp
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2013-03-18 15:59:17 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-03-23 14:42:45 +0100
commit5147b1d4108e36f79aaf4aca539d5cf11726995e (patch)
treea1213f3dc5967c300824e75f06ec48a7e4b4a132 /src/platformsupport/linuxaccessibility/atspiadaptor.cpp
parenta3304489e870555f5d01d02c0252103db2288898 (diff)
Accessibility: Fix crash when updating in dtor
This happens for example when running several tests. Widgets in destructor should be treated as invalid since their window pointer and other properties are no longer valid. When deleting a window containing only a table view there would be a table model reset update comming from the window being destroyed. Change-Id: Ia387c814333ce373fe132b189fc180787e36cdd5 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
Diffstat (limited to 'src/platformsupport/linuxaccessibility/atspiadaptor.cpp')
-rw-r--r--src/platformsupport/linuxaccessibility/atspiadaptor.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/platformsupport/linuxaccessibility/atspiadaptor.cpp b/src/platformsupport/linuxaccessibility/atspiadaptor.cpp
index 001976e9fe..050cb6a0bc 100644
--- a/src/platformsupport/linuxaccessibility/atspiadaptor.cpp
+++ b/src/platformsupport/linuxaccessibility/atspiadaptor.cpp
@@ -809,9 +809,13 @@ void AtSpiAdaptor::windowActivated(QObject* window, bool active)
return;
QAccessibleInterface *iface = QAccessible::queryAccessibleInterface(window);
- Q_ASSERT(iface && iface->isValid());
+ Q_ASSERT(iface);
+ Q_ASSERT(!active || iface->isValid());
- QString windowTitle = iface->text(QAccessible::Name);
+ QString windowTitle;
+ // in dtor it may be invalid
+ if (iface->isValid())
+ windowTitle = iface->text(QAccessible::Name);
delete iface;
QDBusVariant data;