From 9d1a2f130247cb1fb1a1855748b632ad947df9e4 Mon Sep 17 00:00:00 2001 From: AraHaan Date: Sun, 31 Jan 2016 21:22:40 -0600 Subject: [PATCH] Got PTB installing finally working yay. --- .../BetterDiscordWI/panels/Panel2.cs | 59 +++++++++++++++---- 1 file changed, 46 insertions(+), 13 deletions(-) diff --git a/WindowsInstaller/BetterDiscordWI/panels/Panel2.cs b/WindowsInstaller/BetterDiscordWI/panels/Panel2.cs index 34b57a02..c1e3a302 100644 --- a/WindowsInstaller/BetterDiscordWI/panels/Panel2.cs +++ b/WindowsInstaller/BetterDiscordWI/panels/Panel2.cs @@ -189,11 +189,8 @@ namespace BetterDiscordWI.panels Thread t = new Thread(() => { - List lines = new List(); - AppendLog("Spicing index"); - using (FileStream fs = new FileStream(indexloc, FileMode.Open)) { using (StreamReader reader = new StreamReader(fs)) @@ -201,21 +198,57 @@ namespace BetterDiscordWI.panels String line = ""; while((line = reader.ReadLine()) != null) { - if (line.Contains("var _overlay2")) + if (GetParent().DiscordPath.Contains("Discord\\")) { - - lines.Add(line); - lines.Add("var _betterDiscord = require('betterdiscord');"); - + if (line.Contains("var _overlay2")) + { + lines.Add(line); + lines.Add("var _betterDiscord = require('betterdiscord');"); + } + else if (line.Contains("mainWindow = new _BrowserWindow2")) + { + lines.Add(line); + lines.Add(File.ReadAllText("splice")); + } + else + { + lines.Add(line); + } } - else if (line.Contains("mainWindow = new _BrowserWindow2")) + if (GetParent().DiscordPath.Contains("DiscordCanary\\")) { - lines.Add(line); - lines.Add(File.ReadAllText("splice")); + if (line.Contains("var _overlay2")) + { + lines.Add(line); + lines.Add("var _betterDiscord = require('betterdiscord');"); + } + else if (line.Contains("mainWindow = new _BrowserWindow2")) + { + lines.Add(line); + lines.Add(File.ReadAllText("splice")); + } + else + { + lines.Add(line); + } } - else + if (GetParent().DiscordPath.Contains("DiscordPTB\\")) { - lines.Add(line); + //"mainWindow = new _browserWindow2" + if (line.Contains("var _discord_overlay2")) + { + lines.Add(line); + lines.Add("var _betterDiscord = require('betterdiscord');"); + } + else if (line.Contains("mainWindow = new _browserWindow2")) + { + lines.Add(line); + lines.Add(File.ReadAllText("splice")); + } + else + { + lines.Add(line); + } } } }