[cli] Do not set a default bottle choice if known names not found

This commit is contained in:
derrod 2022-01-05 14:52:42 +01:00
parent 9bcfb15cf8
commit 586aeaf6de

View file

@ -2208,7 +2208,7 @@ class LegendaryCLI:
return return
logger.info(f'Using Bottle "{args.crossover_bottle}"') logger.info(f'Using Bottle "{args.crossover_bottle}"')
forced_selection = args.crossover_bottle forced_selection = args.crossover_bottle
elif 'Legendary' not in bottles and not args.download: elif not any(b.startswith('Legendary') for b in bottles) and not args.download:
logger.info('It is recommended to set up a bottle specifically for Legendary, see ' logger.info('It is recommended to set up a bottle specifically for Legendary, see '
'https://legendary.gl/crossover-setup for setup instructions.') 'https://legendary.gl/crossover-setup for setup instructions.')
elif args.download: elif args.download:
@ -2307,10 +2307,8 @@ class LegendaryCLI:
default_choice = bottles.index('Legendary') + 1 default_choice = bottles.index('Legendary') + 1
elif 'Heroic' in bottles: elif 'Heroic' in bottles:
default_choice = bottles.index('Heroic') + 1 default_choice = bottles.index('Heroic') + 1
elif 'default' in bottles:
default_choice = bottles.index('default') + 1
else: else:
default_choice = 1 default_choice = None
for i, bottle in enumerate(bottles, start=1): for i, bottle in enumerate(bottles, start=1):
if i == default_choice: if i == default_choice: