From 9a35111babbccc0bd7b0a681e726a852e9f4cb0b Mon Sep 17 00:00:00 2001
From: amd64fox <62529699+amd64fox@users.noreply.github.com>
Date: Fri, 12 Nov 2021 17:34:30 +0300
Subject: [PATCH] Spicetify fix

---
 Uninstall.bat | 32 +++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/Uninstall.bat b/Uninstall.bat
index c1f8e0d..b37252a 100644
--- a/Uninstall.bat
+++ b/Uninstall.bat
@@ -4,6 +4,8 @@ echo *****************
 echo Author: @amd64fox
 echo *****************
 echo Removing Patch...
+
+
 if exist "%APPDATA%\Spotify\chrome_elf_bak.dll" ( 
     del /s /q "%APPDATA%\Spotify\chrome_elf.dll" > NUL 2>&1
     move "%APPDATA%\Spotify\chrome_elf_bak.dll" "%APPDATA%\Spotify\chrome_elf.dll" > NUL 2>&1
@@ -20,37 +22,45 @@ if exist "%APPDATA%\Spotify\Apps\xpui.bak" (
     move "%APPDATA%\Spotify\Apps\xpui.bak" "%APPDATA%\Spotify\Apps\xpui.spa" > NUL 2>&1
 ) 
 
+
+if exist "%APPDATA%\Spotify\Apps\xpui\xpui.js.bak" (
+    del /s /q "%APPDATA%\Spotify\Apps\xpui\xpui.js" > NUL 2>&1
+	move "%APPDATA%\Spotify\Apps\xpui\xpui.js.bak" "%APPDATA%\Spotify\Apps\xpui\xpui.js" > NUL 2>&1
+)
+
+
 if exist "%APPDATA%\Spotify\blockthespot_log.txt" (
     del /s /q "%APPDATA%\Spotify\blockthespot_log.txt" > NUL 2>&1
 )
 
+
 if exist "%localappdata%\Spotify\Update" (
     del /A:sr %localappdata%\Spotify\Update > NUL 2>&1
 ) 
 
 
-if exist "%appdata%\Spotify\SpotifyMigrator.bak" (
-    rename %appdata%\Spotify\SpotifyMigrator.bak SpotifyMigrator.exe > NUL 2>&1
+if exist "%APPDATA%\Spotify\SpotifyMigrator.bak" (
+    rename %APPDATA%\Spotify\SpotifyMigrator.bak SpotifyMigrator.exe > NUL 2>&1
 ) 
-if exist "%appdata%\Spotify\SpotifyMigrator.exe" (
-if exist "%appdata%\Spotify\SpotifyMigrator.bak" (
-	del /f /s /q %appdata%\Spotify\SpotifyMigrator.bak > NUL 2>&1
+if exist "%APPDATA%\Spotify\SpotifyMigrator.exe" (
+if exist "%APPDATA%\Spotify\SpotifyMigrator.bak" (
+	del /f /s /q %APPDATA%\Spotify\SpotifyMigrator.bak > NUL 2>&1
 ) 
 )
 
 
-if exist "%appdata%\Spotify\Spotify.vbs" (
-    del /f /s /q %appdata%\Spotify\Spotify.vbs > NUL 2>&1
+if exist "%APPDATA%\Spotify\Spotify.vbs" (
+    del /f /s /q %APPDATA%\Spotify\Spotify.vbs > NUL 2>&1
 ) 
 
-if exist "%appdata%\Spotify\cache-spotify.ps1" (
-    del /f /s /q %appdata%\Spotify\cache-spotify.ps1 > NUL 2>&1
+if exist "%APPDATA%\Spotify\cache-spotify.ps1" (
+    del /f /s /q %APPDATA%\Spotify\cache-spotify.ps1 > NUL 2>&1
 	del /f /s /q %USERPROFILE%\Desktop\Spotify.lnk > NUL 2>&1
 
 
 SET Esc_LinkDest=%USERPROFILE%\Desktop\Spotify.lnk
-SET Esc_LinkTarget=%appdata%\Spotify\Spotify.exe
-SET Esc_WorkLinkTarget=%appdata%\Spotify\
+SET Esc_LinkTarget=%APPDATA%\Spotify\Spotify.exe
+SET Esc_WorkLinkTarget=%APPDATA%\Spotify\
 SET cSctVBS=CreateShortcut.vbs
 ((
 echo Set oWS = WScript.CreateObject^("WScript.Shell"^)