diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-12-11 17:26:50 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-12-11 16:34:16 +0000 |
| commit | fbe9accf36ac4c52ef5bcb84d455b4d06c317668 (patch) | |
| tree | 55542d6afbadff2f82bed345a2ef778138bcc2ba /desktop | |
| parent | 19762e8b96f16504e6e7607f96ff9c5c62e9e35c (diff) | |
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@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/app/app.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index f71aa9b482df..e22f0a4eda46 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -2312,6 +2312,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 @@ -2325,8 +2328,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 |