framework/source/services/autorecovery.cxx | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit 57e0c5452af102a5a58f92a6d20e88b9b1def862
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Mon Nov 30 11:38:21 2015 +0100
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)
diff --git a/framework/source/services/autorecovery.cxx
b/framework/source/services/autorecovery.cxx
index 9194db4..26e174a 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;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
