Backport PR #27527: FIX: Add macos timers to the main thread

ksunden · meeseeksmachine · commit 33bbb0520650 · 2023-12-19T00:37:13.000Z
diff --git a/src/_macosx.m b/src/_macosx.m
@@ -1723,11 +1723,15 @@ - (void)flagsChanged:(NSEvent *)event
     }
 
     // hold a reference to the timer so we can invalidate/stop it later
-    self->timer = [NSTimer scheduledTimerWithTimeInterval: interval
-                                            repeats: !single
-                                              block: ^(NSTimer *timer) {
+    self->timer = [NSTimer timerWithTimeInterval: interval
+                                         repeats: !single
+                                           block: ^(NSTimer *timer) {
         gil_call_method((PyObject*)self, "_on_timer");
     }];
+    // Schedule the timer on the main run loop which is needed
+    // when updating the UI from a background thread
+    [[NSRunLoop mainRunLoop] addTimer: self->timer forMode: NSRunLoopCommonModes];
+
 exit:
     Py_XDECREF(py_interval);
     Py_XDECREF(py_single);
