[Libreoffice-commits] core.git: 2 commits - solenv/gdb vcl/unx

[Jan-Marek Glogowski]

 solenv/gdb/libreoffice/vcl.py   |    1 -
 vcl/unx/generic/app/saldata.cxx |    6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit c23f735eb7579477b5de3850eac075a21329c06b
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date:   Fri Jul 28 19:55:03 2017 +0200

    GEN fix timeout result handling
    
    The GEN VCL backend simply ignored the result of the timeout.
    
    Change-Id: I0c1b34927ba97886cf11b2c2a203c3e82d851dc9

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))
commit 0090f1a9a3e6de84b504f21fd63d6488b17a344e
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date:   Fri Jul 28 19:39:25 2017 +0200

    Fix scheduler GDB pretty printer
    
    mbDelete is gone, as we simply check for mpTask.
    
    Change-Id: I9d451f2445fb6b978d177b45d75abde2595c5fac

diff --git a/solenv/gdb/libreoffice/vcl.py b/solenv/gdb/libreoffice/vcl.py
index d8bac0b84331..07f95a697689 100644
--- a/solenv/gdb/libreoffice/vcl.py
+++ b/solenv/gdb/libreoffice/vcl.py
@@ -54,7 +54,6 @@ class ImplSchedulerDataPrinter(object):
                 assert 0 == timer['mnTimeout'], "Idle with timeout == {}".format( timer['mnTimeout'] )
             return res
         else:
-            assert gdbobj['mbDelete'], "No task set and not marked for deletion!"
             return "(no task)"
 
     def to_string(self):