macOS: Fix a crash when the video subsystem quits, if SDL_MAC_NO_SAND…

…BOX was defined when SDL was compiled.
libsdl-org · Sep 30, 2018 · fb48598 · fb48598
1 parent 56ec349
commit fb48598
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/src/video/cocoa/SDL_cocoamousetap.m b/src/video/cocoa/SDL_cocoamousetap.m
@@ -237,6 +237,13 @@
     SDL_MouseEventTapData *tapdata = (SDL_MouseEventTapData*)driverdata->tapdata;
     int status;
 
+    if (tapdata == NULL) {
+        /* event tap was already cleaned up (possibly due to CGEventTapCreate
+         * returning null.)
+         */
+        return;
+    }
+
     /* Ensure that the runloop has been started first.
      * TODO: Move this to InitMouseEventTap, check for error conditions that can
      * happen in Cocoa_MouseTapThread, and fall back to the non-EventTap way of