[Libreoffice-commits] core.git: Branch 'feature/gsoc15-open-remote-files-dialog' - fpicker/source

[Szymon Kłos]

 fpicker/source/office/RemoteFilesDialog.cxx |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 08312042a0ffb680049f20bbc2de9554e1ef09ae
Author: Szymon Kłos <eszkadev at gmail.com>
Date:   Sun Oct 4 13:20:42 2015 +0200

    Remember password after setting new service
    
    Change-Id: I14ba319307f74b24fa474e742504b70c46539a08

diff --git a/fpicker/source/office/RemoteFilesDialog.cxx b/fpicker/source/office/RemoteFilesDialog.cxx
index 7ee410e..0761888 100644
--- a/fpicker/source/office/RemoteFilesDialog.cxx
+++ b/fpicker/source/office/RemoteFilesDialog.cxx
@@ -697,8 +697,10 @@ void RemoteFilesDialog::SavePassword( const OUString& rURL, const OUString& rUse
 
     try
     {
-        if( m_xMasterPasswd->isPersistentStoringAllowed() &&
-            ( !bPersistent || m_xMasterPasswd->authorizateWithMasterPassword( Reference< XInteractionHandler>() ) ) )
+        if( !bPersistent ||
+            ( m_xMasterPasswd->isPersistentStoringAllowed()
+            && m_xMasterPasswd->authorizateWithMasterPassword( Reference< XInteractionHandler>() ) )
+        )
         {
             Reference< XInteractionHandler > xInteractionHandler(
                 InteractionHandler::createWithParent( m_xContext, 0 ),