소스 검색

CEventLoop: Don't re-process already processed events when un-nesting.

If we had already processed a couple of queued events by the time we were
told to un-nest the event loop, we'd put the entire current batch at the
head of the outer queue. This meant that we might end up trying to process
the same events multiple times.

Let's not do that. :^)
Andreas Kling 6 년 전
부모
커밋
d21a4f7518
1개의 변경된 파일6개의 추가작업 그리고 2개의 파일을 삭제
  1. 6 2
      Libraries/LibCore/CEventLoop.cpp

+ 6 - 2
Libraries/LibCore/CEventLoop.cpp

@@ -141,8 +141,12 @@ void CEventLoop::pump(WaitMode mode)
 
         if (m_exit_requested) {
             LOCKER(m_lock);
-            // FIXME: Shouldn't we only prepend the events that haven't been processed yet?
-            m_queued_events.prepend(move(events));
+            decltype(m_queued_events) new_event_queue;
+            new_event_queue.ensure_capacity(m_queued_events.size() + events.size());
+            for (; i < events.size(); ++i)
+                new_event_queue.unchecked_append(move(events[i]));
+            new_event_queue.append(move(m_queued_events));
+            m_queued_events = move(new_event_queue);
             return;
         }
     }