desktop/source/app/app.cxx | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit fbe9accf36ac4c52ef5bcb84d455b4d06c317668
Author: Miklos Vajna <vmik...@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 <mst...@redhat.com>
Tested-by: Michael Stahl <mst...@redhat.com>
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index f71aa9b..e22f0a4 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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
