1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix crash when destroying focus window

Browse Source 
Make sure we don't try to disable input for a window that has
already been destroyed.

Change-Id: I1224599b3c43e2315b3571f01c5896a001614dc4
Reviewed-by: Johan Helsing <johan.helsing@qt.io>
Reviewed-by: Jan Arne Petersen <jan.petersen@kdab.com>
This commit is contained in:
Paul Olav Tvete 2016-11-23 14:01:41 +01:00
parent e56040ec7d
commit d14378ec1c
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/platforms/wayland/qwaylandinputcontext.cpp
View File

@ -532,7 +532,8 @@ void QWaylandInputContext::setFocusObject(QObject *)
if (mCurrentWindow && mCurrentWindow->handle()) { if (mCurrentWindow && mCurrentWindow->handle()) {
if (mCurrentWindow.data() != window || !inputMethodAccepted()) { if (mCurrentWindow.data() != window || !inputMethodAccepted()) {
struct ::wl_surface *surface = static_cast<QWaylandWindow *>(mCurrentWindow->handle())->object(); struct ::wl_surface *surface = static_cast<QWaylandWindow *>(mCurrentWindow->handle())->object();
textInput()->disable(surface); if (surface)
textInput()->disable(surface);
mCurrentWindow.clear(); mCurrentWindow.clear();
} }
} }