Further tweaking of timer event delivery.

1 files changed, 20 insertions, 13 deletions

diff --git a/src/gui/kernel/qeventdispatcher_pepper.cpp b/src/gui/kernel/qeventdispatcher_pepper.cpp
index ea7fbc3dc8..e0f4dce068 100644
--- a/src/gui/kernel/qeventdispatcher_pepper.cpp
+++ b/src/gui/kernel/qeventdispatcher_pepper.cpp
@@ -121,6 +121,17 @@ bool QEventDispatcherPepper::processEvents(QEventLoop::ProcessEventsFlags flags)
     QMutexLocker lock(&mutex);
     
     forever {
+        // Possibly send timer events. The plugin thread sets
+        // this when it recieves a timer callback. Do this
+        // (once) before processing input events to ensure timely
+        // timer delivery.
+        if (callActivateTimers) {
+            callActivateTimers = false;
+            lock.unlock();
+            activateTimers();
+            lock.relock();
+        }
+
         // Process all events in the queue. Release the lock while
         // processing - the plugin thread can add more events.
         while (eventQueue.isEmpty() == false) {
@@ -129,28 +140,24 @@ bool QEventDispatcherPepper::processEvents(QEventLoop::ProcessEventsFlags flags)
             lock.unlock();
             ++eventCount;        
             processPepperEvent(&event);
-            lock.relock();
+ 
+           // Possibly send more timer events.        
+           if (callActivateTimers) {
+               callActivateTimers = false;
+               activateTimers();
+           }
+
+           lock.relock();
         }
 
-        lock.unlock();
-
-        // Possibly send timer events. The plugin thread sets
-        // this when it recieves a timer callback.        
-        if (callActivateTimers) {
-            activateTimers();
-            callActivateTimers = false;        
-        }
-        
         if (!(flags & QEventLoop::WaitForMoreEvents)) {
             break;
         }
 
-        lock.relock();
-
         // Check the queue again while holding the lock to
         // prevent sleeping after the plugin thread has added
         // an event and decided that the qt thread is active.
-        if (eventQueue.isEmpty() == false)
+        if (callActivateTimers || eventQueue.isEmpty() == false)
             continue;
 
         // Wait until the plugin thread adds more events