Touch: Fixes for split view event dispatch

1 files changed, 3 insertions, 1 deletions

diff --git a/src/ui/touch.c b/src/ui/touch.c
index 296e0e08..74a22baf 100644
--- a/src/ui/touch.c
+++ b/src/ui/touch.c
@@ -318,6 +318,8 @@ static void update_TouchState_(void *ptr) {
             if (pixels.x || pixels.y) {
                 subv_F3(&mom->accum, initI2_F3(pixels));
                 dispatchMotion_Touch_(mom->pos, 0);
+                iAssert(mom->affinity);
+                setCurrent_Root(mom->affinity->root);
                 dispatchEvent_Widget(mom->affinity, (SDL_Event *) &(SDL_MouseWheelEvent){
                                                         .type = SDL_MOUSEWHEEL,
                                                         .timestamp = nowTime,
@@ -586,8 +588,8 @@ iBool processEvent_Touch(const SDL_Event *ev) {
 //                   pixels.y, y_F3(amount), y_F3(touch->accum));
             if (pixels.x || pixels.y) {
                 setFocus_Widget(NULL);
-                setCurrent_Root(touch->affinity->root);
                 dispatchMotion_Touch_(touch->pos[0], 0);
+                setCurrent_Root(touch->affinity->root);
                 dispatchEvent_Widget(touch->affinity, (SDL_Event *) &(SDL_MouseWheelEvent){
                     .type = SDL_MOUSEWHEEL,
                     .timestamp = SDL_GetTicks(),