From c23026320003333f64d9696efdf8ad216a06698d Mon Sep 17 00:00:00 2001 From: Fabian Dill Date: Mon, 2 Nov 2020 03:35:03 +0100 Subject: [PATCH] move last used adjuster settings to _2 to avoid conflict with expanded palette options --- Adjuster.py | 2 +- Gui.py | 2 +- Utils.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Adjuster.py b/Adjuster.py index 794bd6c36f..cae177b0ea 100755 --- a/Adjuster.py +++ b/Adjuster.py @@ -65,7 +65,7 @@ def main(): logging.basicConfig(format='%(message)s', level=loglevel) args, path = adjust(args=args) from Utils import persistent_store - persistent_store("adjuster", "last_settings", args) + persistent_store("adjuster", "last_settings_2", args) if __name__ == '__main__': main() diff --git a/Gui.py b/Gui.py index aa3a62206f..23b3bc12be 100755 --- a/Gui.py +++ b/Gui.py @@ -844,7 +844,7 @@ def guiMain(args=None): else: messagebox.showinfo(title="Success", message="Rom patched successfully") from Utils import persistent_store - persistent_store("adjuster", "last_settings", guiargs) + persistent_store("adjuster", "last_settings_2", guiargs) adjustButton = Button(bottomFrame2, text='Adjust Rom', command=adjustRom) diff --git a/Utils.py b/Utils.py index c2d893e77a..4f60a06d02 100644 --- a/Utils.py +++ b/Utils.py @@ -6,7 +6,7 @@ def tuplize_version(version: str) -> typing.Tuple[int, ...]: return tuple(int(piece, 10) for piece in version.split(".")) -__version__ = "3.3.0" +__version__ = "3.3.1" _version_tuple = tuplize_version(__version__) import os @@ -222,7 +222,7 @@ def get_adjuster_settings(romfile: str) -> typing.Tuple[str, bool]: if hasattr(get_adjuster_settings, "adjuster_settings"): adjuster_settings = getattr(get_adjuster_settings, "adjuster_settings") else: - adjuster_settings = persistent_load().get("adjuster", {}).get("last_settings", {}) + adjuster_settings = persistent_load().get("adjuster", {}).get("last_settings_2", {}) if adjuster_settings: import pprint import Patch