Use vwait instead of after in canvImg.test. On macOS protect against exceptions when periodic events are scheduled.

2 files changed, 6 insertions, 5 deletions

diff --git a/macosx/tkMacOSXMouseEvent.c b/macosx/tkMacOSXMouseEvent.c
index e21034e..5b8793c 100644
--- a/macosx/tkMacOSXMouseEvent.c
+++ b/macosx/tkMacOSXMouseEvent.c
@@ -58,6 +58,7 @@ enum {
     NSTrackingArea *trackingArea = nil;
     NSInteger eventNumber, clickCount, buttonNumber;
 #endif
+    [NSEvent stopPeriodicEvents];
 
 #ifdef TK_MAC_DEBUG_EVENTS
     TKLog(@"-[%@(%p) %s] %@", [self class], self, _cmd, theEvent);
@@ -660,6 +661,7 @@ TkpSetCapture(
     while (winPtr && !Tk_IsTopLevel(winPtr)) {
 	winPtr = winPtr->parentPtr;
     }
+    [NSEvent stopPeriodicEvents];
     captureWinPtr = (Tk_Window) winPtr;
 }
 
diff --git a/macosx/tkMacOSXNotify.c b/macosx/tkMacOSXNotify.c
index e554693..098fe4c 100644
--- a/macosx/tkMacOSXNotify.c
+++ b/macosx/tkMacOSXNotify.c
@@ -311,17 +311,16 @@ TkMacOSXEventsSetupProc(
 	if (currentEvent) {
 	    if (currentEvent.type > 0) {
 		Tcl_SetMaxBlockTime(&zeroBlockTime);
-		if (havePeriodicEvents) {
-		    [NSEvent stopPeriodicEvents];
-		    havePeriodicEvents = NO;
-		}
+		[NSEvent stopPeriodicEvents];
+		havePeriodicEvents = NO;
 	    }
 	} else if (!havePeriodicEvents){
 
 	    /*
 	     * When the user is not generating events we schedule a "hearbeat"
 	     * event to fire every 0.1 seconds.  This helps to make the vwait
-	     * command more responsive when there is no user input.
+	     * command more responsive when there is no user input, e.g. when
+	     * running the test suite.
 	     */
 
 	    havePeriodicEvents = YES;