diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-30 11:38:21 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-12-06 14:29:23 +0100 |
| commit | 4982db9047476b742ebc7b02fee8dfa96a5c58db (patch) | |
| tree | add54d3162aec33c54e9dec235b7015f69a977a0 /framework | |
| parent | 513c6092542b0fffa505299545308001a0091c5f (diff) | |
rhbz#1286416: Be more resilient during auto-recovery attempts
...called from within the signal handler, so any bets are off
Change-Id: Iedb5c7bc8d08350e5f3e3118c6713f5c25b238b6
(cherry picked from commit 9b3ca276dae6f8d4f337c78e64ed6b7f7e7662ef)
Reviewed-on: https://gerrit.libreoffice.org/20282
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit 85a4677c201c3957db55ddd66506526d908e7947)
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/services/autorecovery.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx index 8b75271afbac..b05fdc3b3abd 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -2480,6 +2480,8 @@ void AutoRecovery::implts_registerDocument(const css::uno::Reference< css::frame return; css::uno::Reference< css::frame::XFrame > xFrame = xController->getFrame(); + if (!xFrame.is()) + return; css::uno::Reference< css::frame::XDesktop > xDesktop (xFrame->getCreator(), css::uno::UNO_QUERY); if (!xDesktop.is()) return; |