summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJørgen Lind <jorgen.lind@theqtcompany.com>2015-03-25 09:04:34 +0100
committerJørgen Lind <jorgen.lind@theqtcompany.com>2015-08-28 13:09:42 +0200
commit6de8c7a17b9b0a565bcb274399c57b365d50542d (patch)
tree8ea554ddd46c2ae616e5bba0aa245b9da860cd60 /src
parentb980ca33c94c62a714a55a73835af6735a3b8a11 (diff)
downloadqtwayland-6de8c7a17b9b0a565bcb274399c57b365d50542d.tar.gz
Allow CurrentPosition to not having a current view
QWindowCompositor isn't to causious about mouse grabbing, and segfaults if resizing stops when mouse cursor is outside of the window Change-Id: I227df4d63e41f18024776c7d6e2e5de19ee48fbc
Diffstat (limited to 'src')
-rw-r--r--src/compositor/wayland_wrapper/qwlpointer_p.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/compositor/wayland_wrapper/qwlpointer_p.h b/src/compositor/wayland_wrapper/qwlpointer_p.h
index 6eec2590..5fe1fc99 100644
--- a/src/compositor/wayland_wrapper/qwlpointer_p.h
+++ b/src/compositor/wayland_wrapper/qwlpointer_p.h
@@ -83,11 +83,10 @@ public:
void updatePosition(const QPointF &position)
{
- Q_ASSERT(m_view || position.isNull());
m_point = position;
//we adjust if the mouse position is on the edge
//to work around Qt's event propogation
- if (position.isNull())
+ if (!m_view || position.isNull())
return;
if (m_view->surface()) {
QSizeF size(m_view->surface()->size());