Fix "Customize shortcut" dialog not showing up sometimes

Author: Valer100

dialogs/customize_shortcut.py

@@ -53,7 +53,7 @@ def show_change_icon_btn():
         if use_folder_icon.get(): 
             change_icon_btn.forget()
 
-            _icon = preferences.get_folder_icon(path)
+            _icon = shortcut.get_folder_icon(path)
             update_icon(_icon[0], _icon[1])
         else: 
             change_icon_btn.pack(side = "left")

utils/icon.py

@@ -1,4 +1,4 @@
-import ctypes, shutil
+import ctypes, shutil, os
 from io import BytesIO
 from PIL import Image, IcoImagePlugin
 from icoextract import IconExtractor
@@ -12,16 +12,16 @@ def pick_icon(window, initial_icon_file_path: str = "C:\\Windows\\System32\\shel
     ctypes.windll.kernel32.lstrcpyW(icon_file_buffer, initial_icon_file_path)
 
     result = ctypes.windll.shell32.PickIconDlg(ctypes.windll.user32.GetParent(window.winfo_id()), icon_file_buffer, ctypes.sizeof(icon_file_buffer), ctypes.byref(icon_index))
-    if result: return (icon_file_buffer.value, icon_index.value)
+    if result: return (os.path.expandvars(icon_file_buffer.value), icon_index.value)
 
 
-def extract_icon(path: str, index: str) -> None:
+def extract_icon(path: str, index: int) -> None:
     if not path.endswith(".ico"):
         try:
             extractor = IconExtractor(path)
             extractor.export_icon(preferences.temp + "\\icon.ico", index)
         except:
-            extractor = IconExtractor(path.replace("System32", "SystemResources") + ".mun")
+            extractor = IconExtractor(path.lower().replace("system32", "systemresources") + ".mun")
             extractor.export_icon(preferences.temp + "\\icon.ico", index)
     else:
         shutil.copyfile(path, preferences.temp + "\\icon.ico")

utils/shortcut.py

@@ -96,8 +96,8 @@ def get_folder_icon(folder_path: str) -> str:
             _folder_icon_path_list.reverse()
             _folder_icon_index = int(_folder_icon_path_list[0])
 
-            _folder_icon = _folder_icon.lower().replace("," + str(_folder_icon_index), "")
+            _folder_icon = _folder_icon.lower().removesuffix("," + str(_folder_icon_index))
 
-            folder_icon = (_folder_icon.replace("," + str(_folder_icon_index), ""), _folder_icon_index)
+            folder_icon = (os.path.expandvars(_folder_icon), _folder_icon_index)
 
     return folder_icon