[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - vcl/win

[Noel Grandin (via logerrit)]

 vcl/win/app/salinst.cxx |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit c8e38ba0a22caa52f9478060b459feaaa47214c0
Author:     Noel Grandin <noel at peralex.com>
AuthorDate: Thu Feb 4 08:44:45 2021 +0200
Commit:     Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
CommitDate: Mon Feb 22 17:44:46 2021 +0100

    fix sporadic crash in sd_misc_tests on windows
    
    we end up trying to process a timer message, but from inside
    the vcl de-init function, which means the timer stuff has already
    been de-initialised.
    
    Change-Id: I94703219754f1ccabd3065fc5ea437f39264197b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110397
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    (cherry picked from commit 14eff34dd10c047de222813eb16198b295b31d54)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111314
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>

diff --git a/vcl/win/app/salinst.cxx b/vcl/win/app/salinst.cxx
index 476b6350147a..c5a0c6fec04b 100644
--- a/vcl/win/app/salinst.cxx
+++ b/vcl/win/app/salinst.cxx
@@ -573,6 +573,12 @@ LRESULT CALLBACK SalComWndProc( HWND, UINT nMsg, WPARAM wParam, LPARAM lParam, b
     SAL_INFO("vcl.gdi.wndproc", "SalComWndProc(nMsg=" << nMsg << ", wParam=" << wParam
                                 << ", lParam=" << lParam << "); inSendMsg: " << bIsOtherThreadMessage);
 
+    if (ImplGetSVData()->mbDeInit)
+    {
+        SAL_WARN("vcl.gdi.wndproc", "ignoring timer event because we are shutting down");
+        return 0;
+    }
+
     switch ( nMsg )
     {
         case SAL_MSG_THREADYIELD: