[Pkg-owncloud-commits] [owncloud-client] 47/69: Wizard: Fix local folder warning in advanced setup wizard. #2362

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 9b640d586bde4b1e99c4e81ad755e935868cf49f
Author: Christian Kamm <kamm at incasoftware.de>
Date:   Wed Nov 5 12:10:41 2014 +0100

    Wizard: Fix local folder warning in advanced setup wizard. #2362
    
    The _oldLocalFolder should always be the previously configured
    folder, not the one that was most recently chosen on the wizard
    page.
---
 src/mirall/owncloudsetupwizard.cpp       | 1 +
 src/wizard/owncloudadvancedsetuppage.cpp | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/mirall/owncloudsetupwizard.cpp b/src/mirall/owncloudsetupwizard.cpp
index 3dcfd8d..d7be4a2 100644
--- a/src/mirall/owncloudsetupwizard.cpp
+++ b/src/mirall/owncloudsetupwizard.cpp
@@ -111,6 +111,7 @@ void OwncloudSetupWizard::startWizard()
         }
     }
 
+    _ocWizard->setProperty("oldLocalFolder", localFolder);
     _ocWizard->setProperty("localFolder", localFolder);
 
     // remember the local folder to compare later if it changed, but clean first
diff --git a/src/wizard/owncloudadvancedsetuppage.cpp b/src/wizard/owncloudadvancedsetuppage.cpp
index 4a38bb6..b8ae75b 100644
--- a/src/wizard/owncloudadvancedsetuppage.cpp
+++ b/src/wizard/owncloudadvancedsetuppage.cpp
@@ -98,7 +98,7 @@ void OwncloudAdvancedSetupPage::initializePage()
 
     _checking  = false;
     _multipleFoldersExist = false;
-    _oldLocalFolder = localFolder();
+    _oldLocalFolder = wizard()->property("oldLocalFolder").toString();
 
     // call to init label
     updateStatus();

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git