summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2015-03-11 12:26:36 (GMT)
committerdgp <dgp@users.sourceforge.net>2015-03-11 12:26:36 (GMT)
commitb90bb3eabc6136ed390b987e8328140c1bd62e83 (patch)
treee169f5cf0e891cef245d090392ac93cf7c27b152
parent7b3081dffd0d74321af6772ed8343ca030bcaae0 (diff)
parent494ee9b1a9bc5ccb9d9bf33014707084ba299c3e (diff)
downloadtcl-b90bb3eabc6136ed390b987e8328140c1bd62e83.zip
tcl-b90bb3eabc6136ed390b987e8328140c1bd62e83.tar.gz
tcl-b90bb3eabc6136ed390b987e8328140c1bd62e83.tar.bz2
merge trunk
-rw-r--r--macosx/tclMacOSXNotify.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/macosx/tclMacOSXNotify.c b/macosx/tclMacOSXNotify.c
index ef80192..9b7bd1a 100644
--- a/macosx/tclMacOSXNotify.c
+++ b/macosx/tclMacOSXNotify.c
@@ -1412,7 +1412,8 @@ UpdateWaitingListAndServiceEvents(
(tsdPtr->runLoopNestingLevel > 1
|| !tsdPtr->runLoopRunning)) {
tsdPtr->runLoopServicingEvents = 1;
- while (Tcl_ServiceAll() && tsdPtr->waitTime == 0) {}
+ /* This call seems to simply force event processing through and prevents hangups that have long been observed with Tk-Cocoa. */
+ Tcl_ServiceAll();
tsdPtr->runLoopServicingEvents = 0;
}
break;