diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2017-07-28 19:55:03 +0200 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2017-07-28 22:21:15 +0200 |
| commit | c23f735eb7579477b5de3850eac075a21329c06b (patch) | |
| tree | e75be65d66f90a5847b864edecbd649dac260c67 | |
| parent | 0090f1a9a3e6de84b504f21fd63d6488b17a344e (diff) | |
GEN fix timeout result handling
The GEN VCL backend simply ignored the result of the timeout.
Change-Id: I0c1b34927ba97886cf11b2c2a203c3e82d851dc9
| -rw-r--r-- | vcl/unx/generic/app/saldata.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/unx/generic/app/saldata.cxx b/vcl/unx/generic/app/saldata.cxx index 62fdd827ddd1..fb5131473e5a 100644 --- a/vcl/unx/generic/app/saldata.cxx +++ b/vcl/unx/generic/app/saldata.cxx @@ -656,8 +656,9 @@ SalXLib::Yield( bool bWait, bool bHandleAllCurrentEvents ) { // check for timeouts here if you want to make screenshots static char* p_prioritize_timer = getenv ("SAL_HIGHPRIORITY_REPAINT"); + bool bHandledEvent = false; if (p_prioritize_timer != nullptr) - CheckTimeout(); + bHandledEvent = CheckTimeout(); const int nMaxEvents = bHandleAllCurrentEvents ? 100 : 1; @@ -688,7 +689,6 @@ SalXLib::Yield( bool bWait, bool bHandleAllCurrentEvents ) timeval Timeout = noyield_; timeval *pTimeout = &Timeout; - bool bHandledEvent = false; if (bWait) { @@ -725,7 +725,7 @@ SalXLib::Yield( bool bWait, bool bHandleAllCurrentEvents ) // usually handle timeouts here (as in 5.2) if (p_prioritize_timer == nullptr) - CheckTimeout(); + bHandledEvent = CheckTimeout() || bHandledEvent; // handle wakeup events. if ((nFound > 0) && FD_ISSET(m_pTimeoutFDS[0], &ReadFDS)) |