From 057f8cbebaf271f07ffe1e14af45b53aa6216db4 Mon Sep 17 00:00:00 2001
From: codemann8 <codemann8@gmail.com>
Date: Sun, 31 Oct 2021 19:57:40 -0500
Subject: [PATCH] Fixed Shuffle Ganon CLI/GUI issue

---
 Utils.py                    | 19 ++++++-------------
 resources/app/cli/args.json |  2 +-
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/Utils.py b/Utils.py
index bdf71e6b..deed090d 100644
--- a/Utils.py
+++ b/Utils.py
@@ -358,20 +358,13 @@ def update_deprecated_args(args):
         # Shuffle Ganon defaults to TRUE
         # Don't do: Yes
         # Do:       No
-        if isinstance(args.shuffleganon, bool):
-            if "no_shuffleganon" in argVars:
+        if "no_shuffleganon" in argVars:
+            if isinstance(args.shuffleganon, dict):
+                for player in range(1, players + 1):
+                    args.shuffleganon[player] = not args.no_shuffleganon in truthy
+            else:
                 args.shuffleganon = not args.no_shuffleganon in truthy
-        else:
-            for player in range(1, players + 1):
-                args.shuffleganon[player] = not args.no_shuffleganon in truthy
-        
-        if isinstance(args.no_shuffleganon, bool):
-            if "shuffleganon" in argVars:
-                args.no_shuffleganon = not args.shuffleganon in truthy
-        else:
-            for player in range(1, players + 1):
-                args.no_shuffleganon[player] = not args.shuffleganon in truthy
-        
+
         # Playthrough defaults to TRUE
         # Don't do: Yes
         # Do:       No
diff --git a/resources/app/cli/args.json b/resources/app/cli/args.json
index 464fd83b..365e40e6 100644
--- a/resources/app/cli/args.json
+++ b/resources/app/cli/args.json
@@ -358,7 +358,7 @@
     "help": "suppress"
   },
   "shuffleganon": {
-    "action": "store_false",
+    "action": "store_true",
     "type": "bool",
     "help": "suppress"
   },