LttPClient: prevent crash when trying to access sys.stdin
This commit is contained in:
parent
e9d1dcc46c
commit
ca3e01b15e
|
@ -920,7 +920,7 @@ async def main():
|
|||
meta, romfile = Patch.create_rom_file(args.diff_file)
|
||||
args.connect = meta["server"]
|
||||
logging.info(f"Wrote rom file to {romfile}")
|
||||
adjustedromfile, adjusted = Utils.get_adjuster_settings(romfile)
|
||||
adjustedromfile, adjusted = Utils.get_adjuster_settings(romfile, gui_enabled)
|
||||
if adjusted:
|
||||
try:
|
||||
shutil.move(adjustedromfile, romfile)
|
||||
|
|
4
Utils.py
4
Utils.py
|
@ -282,7 +282,7 @@ def persistent_load() -> typing.Dict[dict]:
|
|||
return storage
|
||||
|
||||
|
||||
def get_adjuster_settings(romfile: str) -> typing.Tuple[str, bool]:
|
||||
def get_adjuster_settings(romfile: str, skip_questions: bool = False) -> typing.Tuple[str, bool]:
|
||||
if hasattr(get_adjuster_settings, "adjuster_settings"):
|
||||
adjuster_settings = getattr(get_adjuster_settings, "adjuster_settings")
|
||||
else:
|
||||
|
@ -312,6 +312,8 @@ def get_adjuster_settings(romfile: str) -> typing.Tuple[str, bool]:
|
|||
adjust_wanted = getattr(get_adjuster_settings, "adjust_wanted")
|
||||
elif persistent_load().get("adjuster", {}).get("never_adjust", False): # never adjust, per user request
|
||||
return romfile, False
|
||||
elif skip_questions:
|
||||
return romfile, False
|
||||
else:
|
||||
adjust_wanted = input(f"Last used adjuster settings were found. Would you like to apply these? \n"
|
||||
f"{pprint.pformat(printed_options)}\n"
|
||||
|
|
|
@ -83,12 +83,6 @@ def create_region(world: MultiWorld, player: int, name: str, locations=None, exi
|
|||
class SubnauticaLocation(Location):
|
||||
game: str = "Subnautica"
|
||||
|
||||
def __init__(self, player: int, name: str, address=None, parent=None):
|
||||
super(SubnauticaLocation, self).__init__(player, name, address, parent)
|
||||
|
||||
|
||||
class SubnauticaItem(Item):
|
||||
game = "Subnautica"
|
||||
|
||||
def __init__(self, name, advancement, code, player: int = None):
|
||||
super(SubnauticaItem, self).__init__(name, advancement, code, player)
|
||||
|
|
Loading…
Reference in New Issue