From 0395c8593b2b897386107d52a55785cb8590ca46 Mon Sep 17 00:00:00 2001 From: Nathan Neulinger Date: Tue, 2 Jul 2019 10:27:23 -0500 Subject: [PATCH] #6409 Time out read events for clipboard --- src/lib/platform/XWindowsClipboard.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/lib/platform/XWindowsClipboard.cpp b/src/lib/platform/XWindowsClipboard.cpp index 7e79f7e3..5377504f 100644 --- a/src/lib/platform/XWindowsClipboard.cpp +++ b/src/lib/platform/XWindowsClipboard.cpp @@ -1333,6 +1333,12 @@ XWindowsClipboard::CICCCMGetClipboard::readClipboard(Display* display, // process events if any otherwise sleep if (noWait || XPending(display) > 0) { while (!m_done && !m_failed && (noWait || XPending(display) > 0)) { + // fail if timeout has expired + if (timeout.getTime() >= s_timeout) { + m_failed = true; + break; + } + XNextEvent(display, &xevent); if (!processEvent(display, &xevent)) { // not processed so save it