Stop overwriting manual input for reals this time

This commit is contained in:
Matt 2020-12-12 23:21:46 -05:00
parent 07313a38b8
commit ec59fb8cbe

View file

@ -112,8 +112,7 @@ class Connect(object):
return state['Credentials'] return state['Credentials']
elif (server_selection or state['State'] == CONNECTION_STATE['ServerSelection'] or state['State'] == CONNECTION_STATE['Unavailable'] and not settings('SyncInstallRunDone.bool')): elif (server_selection or state['State'] == CONNECTION_STATE['ServerSelection'] or state['State'] == CONNECTION_STATE['Unavailable'] and not settings('SyncInstallRunDone.bool')):
state['Credentials']['Servers'] = [self.select_servers(state)]
self.select_servers(state)
elif state['State'] == CONNECTION_STATE['ServerSignIn']: elif state['State'] == CONNECTION_STATE['ServerSignIn']:
if 'ExchangeToken' not in state['Servers'][0]: if 'ExchangeToken' not in state['Servers'][0]:
@ -170,13 +169,12 @@ class Connect(object):
if dialog.is_server_selected(): if dialog.is_server_selected():
LOG.debug("Server selected: %s", dialog.get_server()) LOG.debug("Server selected: %s", dialog.get_server())
return return dialog.get_server()
elif dialog.is_manual_server(): elif dialog.is_manual_server():
LOG.debug("Adding manual server") LOG.debug("Adding manual server")
try: try:
self.manual_server() return self.manual_server()
return
except RuntimeError: except RuntimeError:
pass pass
else: else: