diff options
| author | Noel Grandin <noel@peralex.com> | 2021-02-04 08:44:45 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-02-04 09:22:18 +0100 |
| commit | 14eff34dd10c047de222813eb16198b295b31d54 (patch) | |
| tree | d61dd51b790361fd0380eff4eea6fd6859b41956 /vcl/win/app/salinst.cxx | |
| parent | 71c32c31dab86fe9c6d5893eee6821beaa3a3f43 (diff) | |
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@collabora.co.uk>
Diffstat (limited to 'vcl/win/app/salinst.cxx')
| -rw-r--r-- | vcl/win/app/salinst.cxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/vcl/win/app/salinst.cxx b/vcl/win/app/salinst.cxx index 828bd8fec248..ea4c9420beb0 100644 --- a/vcl/win/app/salinst.cxx +++ b/vcl/win/app/salinst.cxx @@ -557,6 +557,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: |