From bf8ab019c68c28fdf3bff6dd9668a0a010290d65 Mon Sep 17 00:00:00 2001
From: ivenovalue <ivenovalue@gmail.com>
Date: Thu, 11 Feb 2016 20:00:33 +0100
Subject: [PATCH] Changed the sequence of actions.

---
 .../BetterDiscordWI/panels/Panel2.cs          | 37 +++++++++----------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/WindowsInstaller/BetterDiscordWI/panels/Panel2.cs b/WindowsInstaller/BetterDiscordWI/panels/Panel2.cs
index bae2fd2..84b1194 100644
--- a/WindowsInstaller/BetterDiscordWI/panels/Panel2.cs
+++ b/WindowsInstaller/BetterDiscordWI/panels/Panel2.cs
@@ -138,32 +138,31 @@ namespace BetterDiscordWI.panels {
                     Thread.Sleep(100);
                 }
 
-                AppendLog("Moving BetterDiscord to resources\\node_modules\\");
+				AppendLog("Extracting app.asar");
+				string appAsarPath = GetParent().DiscordPath + "\\resources\\app.asar";
 
-                Directory.Move(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\BetterDiscord\\temp\\BetterDiscordApp-stable", GetParent().DiscordPath + "\\resources\\node_modules\\BetterDiscord");
+				if(File.Exists(appAsarPath)) {
+					AsarArchive archive = new AsarArchive(appAsarPath);
+					AsarExtractor extractor = new AsarExtractor();
+					extractor.ExtractAll(archive, GetParent().DiscordPath + "\\resources\\app\\");
+				} else {
+					AppendLog("Error: app.asar file couldn't be found in 'resources' folder. Installation cannot Continue.");
+					errors = 1;
+					Finalize(errors);
+				}
 
-                try {
-                    AppendLog("Extracting app.asar");
-					string appAsarPath = GetParent().DiscordPath + "\\resources\\app.asar";
-
-					if(File.Exists(appAsarPath)) {
-						AsarArchive archive = new AsarArchive(appAsarPath);
-
-						AsarExtractor extractor = new AsarExtractor();
-						//Add extraoffset of 3
-						extractor.ExtractAll(archive, GetParent().DiscordPath + "\\resources\\app\\");
+				if(errors == 0) {
+					AppendLog("Moving BetterDiscord to resources\\node_modules\\");
+					Directory.Move(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\BetterDiscord\\temp\\BetterDiscordApp-stable", GetParent().DiscordPath + "\\resources\\node_modules\\BetterDiscord");
 
+					try {
 						Splice();
-					} else {
-						AppendLog("Error: app.asar file couldn't be found in 'resources' folder. Installation cannot Continue.");
+					} catch {
+						AppendLog("Error: Extracting app.asar: Newtonsoft.Json.dll might not be present in the Installer Folder. Installation cannot Continue.");
 						errors = 1;
 						Finalize(errors);
 					}
-                } catch {
-                    AppendLog("Error: Extracting app.asar: Newtonsoft.Json.dll might not be present in the Installer Folder. Installation cannot Continue.");
-                    errors = 1;
-                    Finalize(errors);
-                }
+				}
             });