Merge commit 'fdb86b8266947e225f058b32ebb77fa949f6ae42' into main

src/video/x11/SDL_x11touch.c

@@ -31,9 +31,7 @@
 void
 X11_InitTouch(_THIS)
 {
-    if (X11_Xinput2IsMultitouchSupported()) {
-        X11_InitXinput2Multitouch(_this);
-    }
+    X11_InitXinput2Multitouch(_this);
 }
 
 void

src/video/x11/SDL_x11xinput2.c

@@ -265,6 +265,11 @@ X11_InitXinput2Multitouch(_THIS)
     SDL_VideoData *data = (SDL_VideoData *) _this->driverdata;
     XIDeviceInfo *info;
     int ndevices,i,j;
+
+    if (!X11_Xinput2IsMultitouchSupported()) {
+        return;
+    }
+
     info = X11_XIQueryDevice(data->display, XIAllDevices, &ndevices);
 
     for (i = 0; i < ndevices; i++) {
@@ -354,6 +359,10 @@ X11_Xinput2GrabTouch(_THIS, SDL_Window *window)
     XIGrabModifiers mods;
     XIEventMask eventmask;
 
+    if (!X11_Xinput2IsMultitouchSupported()) {
+        return;
+    }
+
     mods.modifiers = XIAnyModifier;
     mods.status = 0;
 
@@ -379,6 +388,10 @@ X11_Xinput2UngrabTouch(_THIS, SDL_Window *window)
 
     XIGrabModifiers mods;
 
+    if (!X11_Xinput2IsMultitouchSupported()) {
+        return;
+    }
+
     mods.modifiers = XIAnyModifier;
     mods.status = 0;