move last used adjuster settings to _2 to avoid conflict with expanded palette options
This commit is contained in:
		
							parent
							
								
									d95a16a09e
								
							
						
					
					
						commit
						c230263200
					
				| 
						 | 
				
			
			@ -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()
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										2
									
								
								Gui.py
								
								
								
								
							
							
						
						
									
										2
									
								
								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)
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										4
									
								
								Utils.py
								
								
								
								
							
							
						
						
									
										4
									
								
								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
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue