summaryrefslogtreecommitdiff
path: root/src/leap/bitmask
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2014-02-17 11:46:31 -0400
committerKali Kaneko <kali@leap.se>2014-02-17 11:46:31 -0400
commitb814e84107ae1d89e0c9d2392b6d3ef7fee4bb53 (patch)
treee490cd2c7b941634163e77a1e0815bff4d2f8e1a /src/leap/bitmask
parent75e564c7a98243d3b2ba6bea2478abe69a875855 (diff)
parent7cfe280436db6ef1eb89281c23c71163df0ecdfa (diff)
Merge remote-tracking branch 'ivan-github/feature/preserve-uuid-on-logout' into develop
Diffstat (limited to 'src/leap/bitmask')
-rw-r--r--src/leap/bitmask/crypto/srpauth.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/leap/bitmask/crypto/srpauth.py b/src/leap/bitmask/crypto/srpauth.py
index 1fb7b774..b46f0ea6 100644
--- a/src/leap/bitmask/crypto/srpauth.py
+++ b/src/leap/bitmask/crypto/srpauth.py
@@ -600,7 +600,8 @@ class SRPAuth(QtCore.QObject):
QtCore.QMutexLocker(self._uuid_lock)
full_uid = "%s@%s" % (
self._username, self._provider_config.get_domain())
- self._settings.set_uuid(full_uid, uuid)
+ if uuid is not None: # avoid removing the uuid from settings
+ self._settings.set_uuid(full_uid, uuid)
self._uuid = uuid
def get_uuid(self):