diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-30 11:38:21 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-30 11:46:26 +0100 |
| commit | 57e0c5452af102a5a58f92a6d20e88b9b1def862 (patch) | |
| tree | 1003f074a873aa6391ae7d1db293e38d1b7ab7e4 /framework | |
| parent | 442d064188a2d50406e485d033accfffe4bd54e9 (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)
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 9194db477793..26e174a0007c 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -2475,6 +2475,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; |