From 532776a696936cc6694ad460007a17bf87d65c1a Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Wed, 10 Feb 2016 04:27:04 +0200
Subject: [PATCH] Latest asar.net, added emotecache deletion

---
 .../BetterDiscordWI/BetterDiscordWI.csproj    |   2 +-
 .../BetterDiscordWI/panels/Panel2.cs          |  24 ++++++++++++++++++
 WindowsInstaller/dlls/asardotnet.dll          | Bin 8704 -> 8704 bytes
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/WindowsInstaller/BetterDiscordWI/BetterDiscordWI.csproj b/WindowsInstaller/BetterDiscordWI/BetterDiscordWI.csproj
index 0ed997317..478c8ae1b 100644
--- a/WindowsInstaller/BetterDiscordWI/BetterDiscordWI.csproj
+++ b/WindowsInstaller/BetterDiscordWI/BetterDiscordWI.csproj
@@ -41,7 +41,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="asardotnet">
-      <HintPath>bin\dlls\asardotnet.dll</HintPath>
+      <HintPath>..\dlls\asardotnet.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
diff --git a/WindowsInstaller/BetterDiscordWI/panels/Panel2.cs b/WindowsInstaller/BetterDiscordWI/panels/Panel2.cs
index 0d47b1eb9..e4b81b11c 100644
--- a/WindowsInstaller/BetterDiscordWI/panels/Panel2.cs
+++ b/WindowsInstaller/BetterDiscordWI/panels/Panel2.cs
@@ -64,6 +64,30 @@ private void CreateDirectories()
             {
                 _dataPath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\BetterDiscord";
                 _tempPath = _dataPath + "\\temp";
+                AppendLog("Deleting old cached files");
+                try
+                {
+                    if (File.Exists(_dataPath + "\\emotes_bttv.json"))
+                    {
+                        File.Delete(_dataPath + "\\emotes_bttv.json");
+                    }
+                    if (File.Exists(_dataPath + "\\emotes_bttv_2.json"))
+                    {
+                        File.Delete(_dataPath + "\\emotes_bttv_2.json");
+                    }
+                    if (File.Exists(_dataPath + "\\emotes_ffz.json")) {
+                        File.Delete(_dataPath + "\\emotes_ffz.json");
+                    }
+                    if (File.Exists(_dataPath + "\\emotes_twitch_global.json")) {
+                        File.Delete(_dataPath + "\\emotes_twitch_global.json");
+                    }
+                    if (File.Exists(_dataPath + "\\emotes_twitch_subscriber.json")) {
+                        File.Delete(_dataPath + "\\emotes_twitch_subscriber.json");
+                    }
+                    if (File.Exists(_dataPath + "\\user.json")) {
+                        File.Delete(_dataPath + "\\user.json");
+                    }
+                } catch (Exception e) { AppendLog("Failed to delete one or more cached files"); }
 
 
                 if (Directory.Exists(_tempPath))
diff --git a/WindowsInstaller/dlls/asardotnet.dll b/WindowsInstaller/dlls/asardotnet.dll
index f6dc24859366d3135452071bd979c06c4ae150e0..07158322a8977944b400963d8701073b1b41c390 100644
GIT binary patch
delta 2592
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

delta 2302
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