From e27413750318f05d68ff558ab92d12a98975db81 Mon Sep 17 00:00:00 2001
From: Mykola Grymalyuk <48863253+khronokernel@users.noreply.github.com>
Date: Sat, 8 May 2021 20:52:26 -0600
Subject: [PATCH] Fix codesigning crashes

---
 Resources/CliMenu.py  | 11 +++++------
 Resources/SysPatch.py |  9 ++++++---
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/Resources/CliMenu.py b/Resources/CliMenu.py
index 96676050f..da74a8f76 100644
--- a/Resources/CliMenu.py
+++ b/Resources/CliMenu.py
@@ -6,8 +6,6 @@ import subprocess
 import sys
 import time
 import platform
-import tkinter as tk
-from tkinter import colorchooser
 
 from Resources import Build, ModelArray, Constants, SysPatch, Utilities
 
@@ -374,10 +372,11 @@ Custom names will report as follows:
         """)
         change_menu = input("Set custom CPU Name(1,2,3): ")
         if change_menu == "1":
-            temp_tk_root = tk.Tk()
-            temp_tk_root.wm_withdraw()
-            self.constants.custom_color = colorchooser.askcolor(title="Choose color")
-            temp_tk_root.destroy()
+            print("")
+            #temp_tk_root = tk.Tk()
+            #temp_tk_root.wm_withdraw()
+            #self.constants.custom_color = colorchooser.askcolor(title="Choose color")
+            #temp_tk_root.destroy()
         elif change_menu == "2":
             self.constants.custom_color = ""
         else:
diff --git a/Resources/SysPatch.py b/Resources/SysPatch.py
index ac93d968b..bb356dbf5 100644
--- a/Resources/SysPatch.py
+++ b/Resources/SysPatch.py
@@ -136,9 +136,12 @@ class PatchSysVolume:
                 #    print("- Merging legacy Nvidia Kepler Kexts and Bundles")
                 #    self.add_new_binaries(ModelArray.AddNvidiaKeplerAccel11, self.constants.legacy_nvidia_kepler_path)
             elif dgpu_vendor == self.constants.pci_amd_ati:
-                print("- Merging legacy AMD Kexts and Bundles")
-                self.delete_old_binaries(ModelArray.DeleteAMDAccel11)
-                self.add_new_binaries(ModelArray.AddAMDAccel11, self.constants.legacy_amd_path)
+                if dgpu_device in PCIIDArray.amd_ids().terascale_1_ids:
+                    print("- Merging legacy TeraScale 1 AMD Kexts and Bundles")
+                    self.delete_old_binaries(ModelArray.DeleteAMDAccel11)
+                    self.add_new_binaries(ModelArray.AddAMDAccel11, self.constants.legacy_amd_path)
+                #elif dgpu_device in PCIIDArray.amd_ids().terascale_2_ids:
+                #    print("- Merging legacy AMD TeraScale 2 Kexts and Bundles")
         if igpu_vendor:
             print(f"- Found IGPU: {igpu_vendor}:{igpu_device}")
             if igpu_vendor == self.constants.pci_intel: