1 |
From 7152588cb973f585f620cf9abbb72f4a05037124 Mon Sep 17 00:00:00 2001 |
2 |
From: Stephan Bergmann <sbergman@redhat.com> |
3 |
Date: Mon, 30 Nov 2015 11:38:21 +0100 |
4 |
Subject: [PATCH] rhbz#1286416: Be more resilient during auto-recovery attempts |
5 |
|
6 |
...called from within the signal handler, so any bets are off |
7 |
|
8 |
Change-Id: Iedb5c7bc8d08350e5f3e3118c6713f5c25b238b6 |
9 |
(cherry picked from commit 9b3ca276dae6f8d4f337c78e64ed6b7f7e7662ef) |
10 |
--- |
11 |
framework/source/services/autorecovery.cxx | 2 ++ |
12 |
1 file changed, 2 insertions(+) |
13 |
|
14 |
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx |
15 |
index 1bf2f10..3c5302f 100644 |
16 |
--- a/framework/source/services/autorecovery.cxx |
17 |
+++ b/framework/source/services/autorecovery.cxx |
18 |
@@ -2482,6 +2482,8 @@ void AutoRecovery::implts_registerDocument(const css::uno::Reference< css::frame |
19 |
return; |
20 |
|
21 |
css::uno::Reference< css::frame::XFrame > xFrame = xController->getFrame(); |
22 |
+ if (!xFrame.is()) |
23 |
+ return; |
24 |
css::uno::Reference< css::frame::XDesktop > xDesktop (xFrame->getCreator(), css::uno::UNO_QUERY); |
25 |
if (!xDesktop.is()) |
26 |
return; |
27 |
-- |
28 |
2.4.3 |
29 |
|