diff options
author | Frederik Gladhorn <frederik.gladhorn@nokia.com> | 2011-04-01 12:12:32 +0200 |
---|---|---|
committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-10 12:54:44 +0200 |
commit | 2c7c8cf5d0a5d44b2dd84181c1f1a1e84fd5e0ac (patch) | |
tree | bf9c48bf76570e5b8d7ae259cc8d8af737a4bf85 /src/plugins/accessible | |
parent | 1422ce7ded3848501df2b4dd6cb9a4434a5dda36 (diff) |
Don't crash when requesting text.
Sometimes during initialization the QAccessibleItemRow will
still be in an invalid state.
Reviewed-by: Jan-Arve
(cherry picked from commit 90b4cf4b1aa0f70a62118e200e76dc1dc57985cc)
Diffstat (limited to 'src/plugins/accessible')
-rw-r--r-- | src/plugins/accessible/widgets/complexwidgets.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/plugins/accessible/widgets/complexwidgets.cpp b/src/plugins/accessible/widgets/complexwidgets.cpp index e6384133c0..85be0b0131 100644 --- a/src/plugins/accessible/widgets/complexwidgets.cpp +++ b/src/plugins/accessible/widgets/complexwidgets.cpp @@ -971,7 +971,11 @@ QString QAccessibleItemView::text(Text t, int child) const return QAccessibleAbstractScrollArea::text(t, child); QAccessibleItemRow item(itemView(), childIndex(child)); - return item.text(t, 1); + if (item.isValid()) { + return item.text(t, 1); + } else { + return QString(); + } } else { return QAccessibleAbstractScrollArea::text(t, child); } |