commit c23f735eb7579477b5de3850eac075a21329c06b
author Jan-Marek Glogowski <glogow@fbihome.de> Fri Jul 28 19:55:03 2017 +0200
committer Jan-Marek Glogowski <glogow@fbihome.de> Fri Jul 28 22:21:15 2017 +0200
tree e75be65d66f90a5847b864edecbd649dac260c67
parent 0090f1a9a3e6de84b504f21fd63d6488b17a344e

GEN fix timeout result handling

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

Change-Id: I0c1b34927ba97886cf11b2c2a203c3e82d851dc9

vcl/unx/generic/app/saldata.cxx

diff --git a/vcl/unx/generic/app/saldata.cxx b/vcl/unx/generic/app/saldata.cxx
index 62fdd82..fb51314 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))