yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix 3e53a6283d

Browse source 
The most trivial changes are the one which needs to be tested!
This commit is contained in:
Martin Gräßlin 2015-06-14 05:48:36 +02:00
parent 3e53a6283d
commit 946b1c8d78
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/wayland/seat_interface.cpp
View file

@ -486,7 +486,7 @@ void SeatInterface::setFocusedPointerSurface(SurfaceInterface *surface, const QP
d->globalPointer.focus = Private::Pointer::Focus(); d->globalPointer.focus = Private::Pointer::Focus();
d->globalPointer.focus.surface = surface; d->globalPointer.focus.surface = surface;
PointerInterface *p = d->pointerForSurface(surface); PointerInterface *p = d->pointerForSurface(surface);
if (!p->resource()) { if (p && !p->resource()) {
p = nullptr; p = nullptr;
} }
d->globalPointer.focus.pointer = p; d->globalPointer.focus.pointer = p;
@ -667,7 +667,7 @@ void SeatInterface::setFocusedKeyboardSurface(SurfaceInterface *surface)
d->keys.focus = Private::Keyboard::Focus(); d->keys.focus = Private::Keyboard::Focus();
d->keys.focus.surface = surface; d->keys.focus.surface = surface;
KeyboardInterface *k = d->keyboardForSurface(surface); KeyboardInterface *k = d->keyboardForSurface(surface);
if (!k->resource()) { if (k && !k->resource()) {
k = nullptr; k = nullptr;
} }
d->keys.focus.keyboard = k; d->keys.focus.keyboard = k;
@ -831,7 +831,7 @@ void SeatInterface::setFocusedTouchSurface(SurfaceInterface *surface, const QPoi
d->touchInterface.focus.surface = surface; d->touchInterface.focus.surface = surface;
d->touchInterface.focus.offset = surfacePosition; d->touchInterface.focus.offset = surfacePosition;
TouchInterface *t = d->touchForSurface(surface); TouchInterface *t = d->touchForSurface(surface);
if (!t->resource()) { if (t && !t->resource()) {
t = nullptr; t = nullptr;
} }
d->touchInterface.focus.touch = t; d->touchInterface.focus.touch = t;