mirror of
https://github.com/jellyfin/jellyfin-kodi.git
synced 2024-12-26 10:46:11 +00:00
Merge pull request #444 from mcarlton00/stop-overriding-my-server
Stop autodiscovered servers overriding manual input
This commit is contained in:
commit
505a6dbe6d
2 changed files with 4 additions and 5 deletions
|
@ -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,12 +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()
|
||||||
except RuntimeError:
|
except RuntimeError:
|
||||||
pass
|
pass
|
||||||
else:
|
else:
|
||||||
|
|
|
@ -75,7 +75,7 @@
|
||||||
<onup>noop</onup>
|
<onup>noop</onup>
|
||||||
<onleft>close</onleft>
|
<onleft>close</onleft>
|
||||||
<onright>close</onright>
|
<onright>close</onright>
|
||||||
<ondown>205</ondown>
|
<ondown>206</ondown>
|
||||||
<itemlayout width="510" height="65">
|
<itemlayout width="510" height="65">
|
||||||
<control type="group">
|
<control type="group">
|
||||||
<left>20</left>
|
<left>20</left>
|
||||||
|
|
Loading…
Reference in a new issue