Kaydet (Commit) c23f735e authored tarafından Jan-Marek Glogowski's avatar Jan-Marek Glogowski

GEN fix timeout result handling

The GEN VCL backend simply ignored the result of the timeout.

Change-Id: I0c1b34927ba97886cf11b2c2a203c3e82d851dc9
üst 0090f1a9
...@@ -656,8 +656,9 @@ SalXLib::Yield( bool bWait, bool bHandleAllCurrentEvents ) ...@@ -656,8 +656,9 @@ SalXLib::Yield( bool bWait, bool bHandleAllCurrentEvents )
{ {
// check for timeouts here if you want to make screenshots // check for timeouts here if you want to make screenshots
static char* p_prioritize_timer = getenv ("SAL_HIGHPRIORITY_REPAINT"); static char* p_prioritize_timer = getenv ("SAL_HIGHPRIORITY_REPAINT");
bool bHandledEvent = false;
if (p_prioritize_timer != nullptr) if (p_prioritize_timer != nullptr)
CheckTimeout(); bHandledEvent = CheckTimeout();
const int nMaxEvents = bHandleAllCurrentEvents ? 100 : 1; const int nMaxEvents = bHandleAllCurrentEvents ? 100 : 1;
...@@ -688,7 +689,6 @@ SalXLib::Yield( bool bWait, bool bHandleAllCurrentEvents ) ...@@ -688,7 +689,6 @@ SalXLib::Yield( bool bWait, bool bHandleAllCurrentEvents )
timeval Timeout = noyield_; timeval Timeout = noyield_;
timeval *pTimeout = &Timeout; timeval *pTimeout = &Timeout;
bool bHandledEvent = false;
if (bWait) if (bWait)
{ {
...@@ -725,7 +725,7 @@ SalXLib::Yield( bool bWait, bool bHandleAllCurrentEvents ) ...@@ -725,7 +725,7 @@ SalXLib::Yield( bool bWait, bool bHandleAllCurrentEvents )
// usually handle timeouts here (as in 5.2) // usually handle timeouts here (as in 5.2)
if (p_prioritize_timer == nullptr) if (p_prioritize_timer == nullptr)
CheckTimeout(); bHandledEvent = CheckTimeout() || bHandledEvent;
// handle wakeup events. // handle wakeup events.
if ((nFound > 0) && FD_ISSET(m_pTimeoutFDS[0], &ReadFDS)) if ((nFound > 0) && FD_ISSET(m_pTimeoutFDS[0], &ReadFDS))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment