Fix lack of delay in initial firing of timer on osx (Fixes #11985)

dopplershift · dopplershift · commit ceb3e50ce792 · 2018-09-07T11:57:15.000-06:00
One of the arugments when creating a timer on OSX is the time of first
fire. We were passing 0, which puts the time in the past, which means it
fires as soon as possible. Change to calculate what that time should be.
diff --git a/src/_macosx.m b/src/_macosx.m
@@ -2422,6 +2422,7 @@ static void context_cleanup(const void* info)
     CFRunLoopTimerRef timer;
     CFRunLoopTimerContext context;
     double milliseconds;
+    CFAbsoluteTime firstFire;
     CFTimeInterval interval;
     PyObject* attribute;
     PyObject* failure;
@@ -2446,12 +2447,15 @@ static void context_cleanup(const void* info)
         PyErr_SetString(PyExc_AttributeError, "Timer has no attribute '_single'");
         return NULL;
     }
+    // Need to tell when to first fire this timer, so get the current time
+    // and add an interval.
+    interval = milliseconds / 1000.0;
+    firstFire = CFAbsoluteTimeGetCurrent() + interval;
     switch (PyObject_IsTrue(attribute)) {
         case 1:
             interval = 0;
             break;
-        case 0:
-            interval = milliseconds / 1000.0;
+        case 0: // Set by default above
             break;
         case -1:
         default:
@@ -2475,7 +2479,7 @@ static void context_cleanup(const void* info)
     context.copyDescription = NULL;
     context.info = attribute;
     timer = CFRunLoopTimerCreate(kCFAllocatorDefault,
-                                 0,
+                                 firstFire,
                                  interval,
                                  0,
                                  0,
