[Libreoffice-commits] core.git: vcl/win

Tor Lillqvist tml at collabora.com
Wed Sep 13 05:46:58 UTC 2017


 vcl/win/app/salinst.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit caf9e56a81d28bdb8d447bc9d3538bbd9969ff73
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Aug 29 10:24:16 2017 +0300

    Change assertion failure to SAL_WARN
    
    I hit it multiple times and have no interest in figuring out
    why. Or time.
    
    Change-Id: I3f22c8b62fdcf987b760ac16bfe8a21a8870d33e
    Reviewed-on: https://gerrit.libreoffice.org/42212
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

diff --git a/vcl/win/app/salinst.cxx b/vcl/win/app/salinst.cxx
index 09532902af00..97a5b6c55ad4 100644
--- a/vcl/win/app/salinst.cxx
+++ b/vcl/win/app/salinst.cxx
@@ -722,7 +722,7 @@ LRESULT CALLBACK SalComWndProc( HWND, UINT nMsg, WPARAM wParam, LPARAM lParam, i
             // PM_QS_POSTMESSAGE is needed, so we don't process the SendMessage from DoYield!
             while ( PeekMessageW(&aMsg, nullptr, SAL_MSG_TIMER_CALLBACK,
                                  SAL_MSG_TIMER_CALLBACK, PM_REMOVE | PM_NOYIELD | PM_QS_POSTMESSAGE) )
-                assert(! "Multiple timer messages in queue" );
+                SAL_WARN("vcl", "Multiple timer messages in queue");
             GetSalData()->mbOnIdleRunScheduler = false;
             EmitTimerCallback();
             break;


More information about the Libreoffice-commits mailing list