diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-07-08 14:57:36 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-07-08 14:57:36 -0300 |
| commit | d136315bb987b7624c2fb6883635f8c5f2512270 (patch) | |
| tree | dd50706df83e2210f0aea677b24deaa5ea40bebd /src/leap/gui/wizard.py | |
| parent | 7cba5ebdb8fa4b6c53e7f7d08cfcb9a032e7ac5b (diff) | |
| parent | c9c126b67f1a13483075aae680b30813117fbb05 (diff) | |
Merge remote-tracking branch 'kali/bug/wizard-hangs' into develop
Diffstat (limited to 'src/leap/gui/wizard.py')
| -rw-r--r-- | src/leap/gui/wizard.py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/leap/gui/wizard.py b/src/leap/gui/wizard.py index 67ade349..5333edeb 100644 --- a/src/leap/gui/wizard.py +++ b/src/leap/gui/wizard.py @@ -125,6 +125,11 @@ class Wizard(QtGui.QWizard): self._domain = None self._provider_config = ProviderConfig() + # We will store a reference to the defers for eventual use + # (eg, to cancel them) but not doing anything with them right now. + self._provider_select_defer = None + self._provider_setup_defer = None + self.currentIdChanged.connect(self._current_id_changed) self.ui.lblPassword.setEchoMode(QtGui.QLineEdit.Password) @@ -361,8 +366,8 @@ class Wizard(QtGui.QWizard): self._domain = self.ui.lnProvider.text() self.ui.lblNameResolution.setPixmap(self.QUESTION_ICON) - self._provider_bootstrapper.run_provider_select_checks( - self._domain) + self._provider_select_defer = self._provider_bootstrapper.\ + run_provider_select_checks(self._domain) def _complete_task(self, data, label, complete=False, complete_page=-1): """ @@ -561,7 +566,7 @@ class Wizard(QtGui.QWizard): (self._provider_config .get_name(),)) self.ui.lblDownloadCaCert.setPixmap(self.QUESTION_ICON) - self._provider_bootstrapper.\ + self._provider_setup_defer = self._provider_bootstrapper.\ run_provider_setup_checks(self._provider_config) if pageId == self.PRESENT_PROVIDER_PAGE: |