[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - desktop/source

[Miklos Vajna]

 desktop/source/app/app.cxx |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit a3de61e3cea28a251aefddf6ab245bc5249dee24
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Thu Dec 11 17:26:50 2014 +0100

    desktop: avoid loading to-be-recovered documents when recovery is disabled
    
    Change-Id: I5c8a117df53e0c7efd1e82ec6e56080c8fd42345
    Reviewed-on: https://gerrit.libreoffice.org/13438
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>
    (cherry picked from commit fbe9accf36ac4c52ef5bcb84d455b4d06c317668)

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index b1003f4..98490b4 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -2313,6 +2313,9 @@ void Desktop::OpenClients()
                 SAL_WARN( "desktop.app", "Error during recovery" << e.Message);
             }
         }
+        else if (bExistsRecoveryData && bDisableRecovery)
+            // prevent new Writer doc
+            bRecovery = true;
 
         Reference< XSessionManagerListener2 > xSessionListener;
         try
@@ -2326,8 +2329,7 @@ void Desktop::OpenClients()
             SAL_WARN( "desktop.app", "Registration of session listener failed" << e.Message);
         }
 
-        // in bDisableRecovery case call doRestore() to prevent new Writer doc
-        if ((!bExistsRecoveryData || bDisableRecovery) && xSessionListener.is())
+        if ( !bExistsRecoveryData && xSessionListener.is() )
         {
             // session management
             try