From cfdfd6a8601445f2eb29a392c1be65c4e1122c4b Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Wed, 30 Jul 2014 12:18:55 +0200 Subject: [PATCH] wizard: don't call initializePage It is called automatically by QWizard and do not need to be called explicitly But setVisibla(false) don't really have an effect there since show() is going to be called on the page --- src/wizard/owncloudsetuppage.cpp | 6 +++++- src/wizard/owncloudwizard.cpp | 1 - 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/wizard/owncloudsetuppage.cpp b/src/wizard/owncloudsetuppage.cpp index 06cfbe6e05..e84d6dd3e4 100644 --- a/src/wizard/owncloudsetuppage.cpp +++ b/src/wizard/owncloudsetuppage.cpp @@ -16,6 +16,7 @@ #include #include #include +#include #include #include @@ -145,9 +146,12 @@ void OwncloudSetupPage::initializePage() if (Theme::instance()->overrideServerUrl().isEmpty()) { _ui.leUrl->setFocus(); } else { - setVisible(false); setCommitPage(true); validatePage(); + setVisible(false); + // because the wizard will call show on us right after this call, we need to hide in the + // next event loop iteration. + QTimer::singleShot(0, this, SLOT(hide())); } } diff --git a/src/wizard/owncloudwizard.cpp b/src/wizard/owncloudwizard.cpp index 94e3559cab..4ee870d3da 100644 --- a/src/wizard/owncloudwizard.cpp +++ b/src/wizard/owncloudwizard.cpp @@ -161,7 +161,6 @@ void OwncloudWizard::slotCurrentPageChanged( int id ) if( id == WizardCommon::Page_ServerSetup ) { emit clearPendingRequests(); - _setupPage->initializePage(); } if( id == WizardCommon::Page_Result ) {