diff options
author | Stephan Bergmann <stephan.bergmann@allotropia.de> | 2023-12-15 14:40:53 +0100 |
---|---|---|
committer | Stephan Bergmann <stephan.bergmann@allotropia.de> | 2023-12-16 10:54:01 +0100 |
commit | 62a50239e06ac2f94f4a1cfbef5a8689bd42b875 (patch) | |
tree | 88d526652bf4020641fdd298d63c6d00ac1b44bb /install-sh | |
parent | b03aa9647c860af7948f219ed9a0e90e5eb374d5 (diff) |
Avoid "Desktop disposed before terminating it" assert
...from Desktop::disposing() at framework/source/services/desktop.cxx:1041, on
Windows, when the HAVE_FEATURE_UPDATE_MAR update() call returns true (and
soffice.bin is about to exit now), but the css.frame.Desktop service happens to
already have been created somewhere else (and will thus be disposed as part of
disposing the service manager) but doesn't receive a terminate() call in
Desktop::Main().
So reorder the code in Desktop::Main(), moving the HAVE_FEATURE_UPDATE_MAR code
after the
> xDesktop = css::frame::Desktop::create( xContext );
so that we have something to call
> xDesktop->terminate();
on in this scenario.
Change-Id: Iee5b6eeece33d5a27cadb94a7da0d26aa1492e91
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160831
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>
(cherry picked from commit 98caf4786033da6c39b4f746d79ab4f340683d32)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160850
Diffstat (limited to 'install-sh')
0 files changed, 0 insertions, 0 deletions