aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRainer Hochecker <fernetmenta@online.de>2016-10-09 14:37:39 +0200
committerGitHub <noreply@github.com>2016-10-09 14:37:39 +0200
commitf81687263bb04345d670b386e47f008f43ee0e9a (patch)
tree46d20a79749713773f7640c5d03a4d0217fbd8c7
parentdcd40972bc90936fe260e8991b17e352fe894083 (diff)
parent8465cf558c2b54d685f3c33e965a6ced365e06a7 (diff)
Merge pull request #10664 from FernetMenta/input
X11, osx: yield to main loop after input action has been handled
-rw-r--r--xbmc/windowing/WinEventsSDL.cpp2
-rw-r--r--xbmc/windowing/WinEventsX11.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/xbmc/windowing/WinEventsSDL.cpp b/xbmc/windowing/WinEventsSDL.cpp
index b88f527f02..364f12c096 100644
--- a/xbmc/windowing/WinEventsSDL.cpp
+++ b/xbmc/windowing/WinEventsSDL.cpp
@@ -220,7 +220,7 @@ bool CWinEventsSDL::MessagePump()
SDL_Event event;
bool ret = false;
- while (SDL_PollEvent(&event))
+ while (!ret && SDL_PollEvent(&event))
{
switch(event.type)
{
diff --git a/xbmc/windowing/WinEventsX11.cpp b/xbmc/windowing/WinEventsX11.cpp
index e63851148a..5890cea3b5 100644
--- a/xbmc/windowing/WinEventsX11.cpp
+++ b/xbmc/windowing/WinEventsX11.cpp
@@ -316,7 +316,7 @@ bool CWinEventsX11Imp::MessagePump()
XEvent xevent;
unsigned long serial = 0;
- while (WinEvents && XPending(WinEvents->m_display))
+ while (!ret && XPending(WinEvents->m_display))
{
memset(&xevent, 0, sizeof (XEvent));
XNextEvent(WinEvents->m_display, &xevent);