diff options
| author | Kali Kaneko <kali@leap.se> | 2014-09-24 13:32:54 -0500 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2014-09-24 13:32:54 -0500 |
| commit | f7da7ebb24e1a1c1f65cd257e949c0aa7ff23781 (patch) | |
| tree | 93f6a81820d0d868dd7a086145db5ce3971cf509 /src/leap/bitmask/gui/eip_preferenceswindow.py | |
| parent | cb5f07a8bac7afbbb0c43622d6c831295b6889cb (diff) | |
| parent | c1fa3959fbffb381e067dcd619d528412e235401 (diff) | |
Merge branch 'develop' into deb-0.7.0-rc1
Conflicts:
docs/man/bitmask-root.1.rst
Diffstat (limited to 'src/leap/bitmask/gui/eip_preferenceswindow.py')
| -rw-r--r-- | src/leap/bitmask/gui/eip_preferenceswindow.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/leap/bitmask/gui/eip_preferenceswindow.py b/src/leap/bitmask/gui/eip_preferenceswindow.py index 0f63972f..b5788f3c 100644 --- a/src/leap/bitmask/gui/eip_preferenceswindow.py +++ b/src/leap/bitmask/gui/eip_preferenceswindow.py @@ -116,11 +116,14 @@ class EIPPreferencesWindow(QtGui.QDialog): self.ui.gbGatewaySelector.setEnabled(False) return + # block signals so the currentIndexChanged slot doesn't get triggered + self.ui.cbProvidersGateway.blockSignals(True) for provider, is_initialized in providers: label = provider if not is_initialized: label += self.tr(" (uninitialized)") self.ui.cbProvidersGateway.addItem(label, userData=provider) + self.ui.cbProvidersGateway.blockSignals(False) # Select provider by name domain = self._selected_domain |