summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/windows/accessible
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2014-10-06 11:59:47 +0200
committerOswald Buddenhagen <oswald.buddenhagen@digia.com>2014-10-06 11:59:47 +0200
commitf49d5b578cfca311654e09a5161588401fc3815a (patch)
tree1d97f3e21bf13b4539dc4d9d934fcd3ea92516ec /src/plugins/platforms/windows/accessible
parent848e95025297f8f56443ea7b22a1ddca1cc63cd8 (diff)
parent0edf68120bc72d35d5fe29c84467f5afeacb0585 (diff)
Merge remote-tracking branch 'origin/5.3' into 5.4
Diffstat (limited to 'src/plugins/platforms/windows/accessible')
-rw-r--r--src/plugins/platforms/windows/accessible/qwindowsaccessibility.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/windows/accessible/qwindowsaccessibility.cpp b/src/plugins/platforms/windows/accessible/qwindowsaccessibility.cpp
index 69541b4c1a..d0eb8485fa 100644
--- a/src/plugins/platforms/windows/accessible/qwindowsaccessibility.cpp
+++ b/src/plugins/platforms/windows/accessible/qwindowsaccessibility.cpp
@@ -151,7 +151,7 @@ void QWindowsAccessibility::notifyAccessibilityUpdate(QAccessibleEvent *event)
// An event has to be associated with a window,
// so find the first parent that is a widget and that has a WId
QAccessibleInterface *iface = event->accessibleInterface();
- if (!iface) // ### This should not happen, maybe make it an assert.
+ if (!iface || !iface->isValid())
return;
QWindow *window = QWindowsAccessibility::windowHelper(iface);