diff options
| author | Tomás Touceda <chiiph@leap.se> | 2014-01-07 12:35:25 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2014-01-07 12:35:25 -0300 |
| commit | d16e76cfdeb18b14cd97c9e8c7096b02aafe4da8 (patch) | |
| tree | 25101ba3c59b047e645d54536d2659ef525751c7 /src/leap/bitmask/gui/mainwindow.py | |
| parent | 61e7c5bb403ba652994b54dcea3d3bc169ef23ec (diff) | |
| parent | 5e3adedc6c4de23fe8ef5ee99f3c88977c420329 (diff) | |
Merge remote-tracking branch 'refs/remotes/ivan/bug/4817_disconnect-signals-on-wizard-close' into develop
Diffstat (limited to 'src/leap/bitmask/gui/mainwindow.py')
| -rw-r--r-- | src/leap/bitmask/gui/mainwindow.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py index c05d65fe..1fe2cfca 100644 --- a/src/leap/bitmask/gui/mainwindow.py +++ b/src/leap/bitmask/gui/mainwindow.py @@ -414,7 +414,8 @@ class MainWindow(QtGui.QMainWindow): # setup but does not register self._wizard = None self._backend_connect() - self._finish_init() + if self._wizard_firstrun: + self._finish_init() def _launch_wizard(self): """ @@ -433,7 +434,7 @@ class MainWindow(QtGui.QMainWindow): self._wizard = Wizard(backend=self._backend, bypass_checks=self._bypass_checks) self._wizard.accepted.connect(self._finish_init) - self._wizard.rejected.connect(self._wizard.close) + self._wizard.rejected.connect(self._rejected_wizard) self.setVisible(False) # Do NOT use exec_, it will use a child event loop! |