[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - framework/source

[Stephan Bergmann]

 framework/source/services/autorecovery.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 85a4677c201c3957db55ddd66506526d908e7947
Author: Stephan Bergmann <sbergman at 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)
    Reviewed-on: https://gerrit.libreoffice.org/20282
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index 8b75271..b05fdc3 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;