[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kwayland] src/server: [server] Do not return early on fail in touchDown fall back code
From:       Roman Gilg <null () kde ! org>
Date:       2018-09-18 19:56:49
Message-ID: E1g2M77-0002Xp-Q5 () code ! kde ! org
[Download RAW message or body]

Git commit 3cf4825c80509493d885875694a76cf6dc4d6d26 by Roman Gilg.
Committed on 18/09/2018 at 19:56.
Pushed by romangilg into branch 'master'.

[server] Do not return early on fail in touchDown fall back code

Summary:
Returning early would mean that SeatInterface::Private::touchInterface.ids
does not contain the id. Then the assert would fail in touchUp at some
point later when called by the compositor.

Reviewers: #kwin, #frameworks, davidedmundson

Reviewed By: #kwin, davidedmundson

Subscribers: kde-frameworks-devel

Tags: #frameworks

Differential Revision: https://phabricator.kde.org/D15468

M  +1    -4    src/server/seat_interface.cpp

https://commits.kde.org/kwayland/3cf4825c80509493d885875694a76cf6dc4d6d26

diff --git a/src/server/seat_interface.cpp b/src/server/seat_interface.cpp
index 598ba1c..b75659f 100644
--- a/src/server/seat_interface.cpp
+++ b/src/server/seat_interface.cpp
@@ -1332,7 +1332,7 @@ qint32 SeatInterface::touchDown(const QPointF &globalPosition)
     } else if (id == 0 && focusedTouchSurface()) {
 #if HAVE_LINUX_INPUT_H
         const QPointF pos = globalPosition - d->touchInterface.focus.offset;
-        const bool result = forEachInterface<PointerInterface>(focusedTouchSurface(), d->pointers,
+        forEachInterface<PointerInterface>(focusedTouchSurface(), d->pointers,
             [this, pos, serial] (PointerInterface *p) {
                 wl_pointer_send_enter(p->resource(), serial,
                                 focusedTouchSurface()->resource(),
@@ -1344,9 +1344,6 @@ qint32 SeatInterface::touchDown(const QPointF &globalPosition)
                 p->d_func()->sendFrame();
             }
         );
-        if (!result) {
-            return id;
-        }
 #endif
     }
 
[prev in list] [next in list] [prev in thread] [next in thread]