[Pkg-owncloud-commits] [owncloud-client] 13/89: Fix for c3dc84c58f4047413eff810543a2b6419bcb5548.

[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 ee2efbb071d5a982af4ceb11d4508c24c2721535
Author: Daniel Molkentin <danimo at owncloud.com>
Date:   Thu Dec 5 16:00:27 2013 +0100

    Fix for c3dc84c58f4047413eff810543a2b6419bcb5548.
    
    This resulted in the wizard not coming up the second time around
    because it wasn't destructed properly.
    
    Also fix a comment.
---
 src/mirall/owncloudsetupwizard.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/mirall/owncloudsetupwizard.cpp b/src/mirall/owncloudsetupwizard.cpp
index f113a5d..76b516d 100644
--- a/src/mirall/owncloudsetupwizard.cpp
+++ b/src/mirall/owncloudsetupwizard.cpp
@@ -53,6 +53,7 @@ OwncloudSetupWizard::OwncloudSetupWizard(QObject* parent) :
        Therefore Qt::QueuedConnection is required */
     connect( _ocWizard, SIGNAL(basicSetupFinished(int)),
              this, SLOT(slotAssistantFinished(int)), Qt::QueuedConnection);
+    connect( _ocWizard, SIGNAL(finished(int)), SLOT(deleteLater()));
 }
 
 OwncloudSetupWizard::~OwncloudSetupWizard()
@@ -70,7 +71,6 @@ void OwncloudSetupWizard::runWizard(QObject* obj, const char* amember, QWidget *
 
     wiz = new OwncloudSetupWizard(parent);
     connect( wiz, SIGNAL(ownCloudWizardDone(int)), obj, amember);
-    connect( wiz, SIGNAL(slotAssistantFinished(int)), wiz, SLOT(deleteLater()));
     FolderMan::instance()->setSyncEnabled(false);
     wiz->startWizard();
 }
@@ -376,8 +376,7 @@ void OwncloudSetupWizard::replaceDefaultAccountWith(Account *newAccount)
     newAccount->save();
 }
 
-// Method executed when the user ends the wizard, either with 'accept' or 'reject'.
-// accept the custom config to be the main one if Accepted.
+// Method executed when the user ends has finished the basic setup.
 void OwncloudSetupWizard::slotAssistantFinished( int result )
 {
     FolderMan *folderMan = FolderMan::instance();

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