Possible fix for language problem, though cannot test.

Author: aredden

G14Control.pyw

@@ -13,6 +13,7 @@ import resources
 from G14RunCommands import RunCommands
 from G14Utils import (
     create_icon,
+    get_g14plan,
     is_admin,
     get_app_path,
     rog_keyset,
@@ -222,21 +223,21 @@ def quit_app():
 
     data.run_power_thread = False
     data.run_gaming_thread = False
-    if data.power_thread is not None and data.power_thread.is_alive():
-        data.power_thread.kill()
-        while data.power_thread.isAlive():
-            if data.config["debug"]:
-                print("Waiting for power thread to die...")
-            time.sleep(0.25)
-        print("Power thread was alive, and now is dead.")
-
-    if data.gaming_thread is not None and data.gaming_thread.is_alive():
-        data.gaming_thread.kill()
-        while data.gaming_thread.isAlive():
-            if data.config["debug"]:
-                print("Waiting for gaming thread to die...")
-            time.sleep(0.25)
-        print("Gaming thread was alive, and now is dead.")
+    # if data.power_thread is not None and data.power_thread.is_alive():
+    #     data.power_thread.kill()
+    #     while data.power_thread.isAlive():
+    #         if data.config["debug"]:
+    #             print("Waiting for power thread to die...")
+    #         time.sleep(0.25)
+    #     print("Power thread was alive, and now is dead.")
+
+    # if data.gaming_thread is not None and data.gaming_thread.is_alive():
+    #     data.gaming_thread.kill()
+    #     while data.gaming_thread.isAlive():
+    #         if data.config["debug"]:
+    #             print("Waiting for gaming thread to die...")
+    #         time.sleep(0.25)
+    #     print("Gaming thread was alive, and now is dead.")
     if device is not None:
         device.close()
     try:
@@ -253,13 +254,33 @@ class Windows_Plan_Check(threading.Thread):
     def run(self):
         global data
         while True:
+            requires_reload = False
+
+            # Check for windows plan changes
             plan_tuple = re.findall(
                 r"([0-9a-f\-]{36}) *\((.*)\)",
                 os.popen("powercfg /GETACTIVESCHEME").read(),
             )
             if data.current_windows_plan != plan_tuple[0][1]:
+                print("windows plan")
                 data.update_win_plan(plan_tuple[0][1])
                 data.current_windows_plan = plan_tuple[0][1]
+                requires_reload = True
+
+            # Check for boost changes
+            current = get_g14plan(data.current_plan, data.config)
+            boost = data.main_cmds.get_boost()[-1]
+            if int(boost) is not current["boost"]:
+                print(boost, current["boost"], "Boost")
+                requires_reload = True
+
+            # Check for gpu changes
+            if current["dgpu_enabled"] is not data.main_cmds.get_dgpu():
+                print(current["dgpu_enabled"], data.main_cmds.get_dgpu(), "DGPU")
+                requires_reload = True
+
+            # If reload required, update menu.
+            if requires_reload:
                 global icon_app
                 icon_app.update_menu()
             time.sleep(5)

G14RunCommands.py

@@ -40,10 +40,7 @@ def parse_boolean(self, parse_string):
 
     def get_boost(self):
         # I know, it's ugly, but no other way to do that from py.
-        current_pwr = os.popen("powercfg /GETACTIVESCHEME")
-        pwr_guid = (
-            current_pwr.readlines()[0].rsplit(": ")[1].rsplit(" (")[0].lstrip("\n")
-        )  # Parse the GUID
+        pwr_guid = list(get_active_windows_plan().values())[0]  # Parse the GUID
         SUB_PROCESSOR = " 54533251-82be-4824-96c1-47b60b740d00"
         PERFBOOSTMODE = " be337238-0d82-4146-a960-4f3749d470c7"
         # Let's get the boost option in the currently active power scheme
@@ -58,14 +55,11 @@ def get_boost(self):
 
     def do_boost(self, state):
         # Just to be safe, let's get the current power scheme
-        CURRENT_SCHEME = os.popen("powercfg /GETACTIVESCHEME")
         SUB_PROCESSOR = "54533251-82be-4824-96c1-47b60b740d00"
         PERFBOOSTMODE = "be337238-0d82-4146-a960-4f3749d470c7"
         set_ac = "powercfg /setacvalueindex"
         set_dc = "powercfg /setdcvalueindex"
-        pwr_guid = (
-            CURRENT_SCHEME.readlines()[0].rsplit(": ")[1].rsplit(" (")[0].lstrip("\n")
-        )  # Parse the GUID
+        pwr_guid = list(get_active_windows_plan().values())[0]
         if state is False:
             state = 0
         SET_AC_VAL = "{0} {1} {2} {3} {4}".format(
@@ -128,16 +122,11 @@ def set_boost(self, state, notification=True):
 
     def get_dgpu(self):
         # Get active windows power scheme
-        current_pwr = os.popen("powercfg /GETACTIVESCHEME")
-        CURRENT_GUID = re.findall(r"[0-9a-fA-F\-]{36}", current_pwr.read())[
-            0
-        ]  # Parse the GUID
+        pwr_guid = list(get_active_windows_plan().values())[0]  # Parse the GUID
         SW_DYNAMC_GRAPHICS = "e276e160-7cb0-43c6-b20b-73f5dce39954"
         GLOBAL_SETTINGS = "a1662ab2-9d34-4e53-ba8b-2639b9e20857"
         pwr_settings = os.popen(
-            " ".join(
-                ["powercfg", "/q", CURRENT_GUID, SW_DYNAMC_GRAPHICS, GLOBAL_SETTINGS]
-            )
+            " ".join(["powercfg", "/q", pwr_guid, SW_DYNAMC_GRAPHICS, GLOBAL_SETTINGS])
         )  # Let's get the dGPU status in the current power scheme
         output = pwr_settings.readlines()  # We save the output to parse it afterwards
         # Convert to boolean for "On/Off"
@@ -150,8 +139,7 @@ def get_dgpu(self):
     def set_dgpu(self, state, notification=True):
         G14dir = self.G14dir
         # Just to be safe, let's get the current power scheme
-        current_pwr = os.popen("powercfg /GETACTIVESCHEME")
-        CURRENT_GUID = re.findall(r"[0-9a-fA-F\-]{36}", current_pwr.read())[0]
+        pwr_guid = list(get_active_windows_plan().values())[0]
         SW_DYNAMC_GRAPHICS = "e276e160-7cb0-43c6-b20b-73f5dce39954"
         GLOBAL_SETTINGS = "a1662ab2-9d34-4e53-ba8b-2639b9e20857"
         AC = "/setacvalueindex"
@@ -163,7 +151,7 @@ def _set_dgpu(SETTING, AC_DC):
                     [
                         "powercfg",
                         AC_DC,
-                        CURRENT_GUID,
+                        pwr_guid,
                         SW_DYNAMC_GRAPHICS,
                         GLOBAL_SETTINGS,
                         str(SETTING),

G14Utils.py

@@ -182,6 +182,13 @@ def get_windows_theme():
     return value  # 1 for light theme, 0 for dark theme
 
 
+def get_g14plan(current, config):
+    plans = config["plans"]
+    for p in plans:
+        if p["name"] == current:
+            return p
+
+
 def create_icon(config):
     if (
         get_windows_theme() == 0