From 8912d5b8e21e3eb2c57126cbb8a3f368573b59d4 Mon Sep 17 00:00:00 2001
From: Michel Verhagen <michel@guruce.com>
Date: Fri, 21 Nov 2014 18:08:01 +1300
Subject: [PATCH] Now clearing mruData when master password changes Fixed
 resizing issue Now using MasterPassword icon in "Add Remove Programs"
 Increased version number to 1.4

---
 MasterPassword/CSharp/MPSetup/Product.wxs                    | 2 ++
 .../CSharp/MasterPassword/Properties/AssemblyInfo.cs         | 2 +-
 MasterPassword/CSharp/MasterPassword/frmMain.Designer.cs     | 5 +++--
 MasterPassword/CSharp/MasterPassword/frmMain.cs              | 3 +++
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/MasterPassword/CSharp/MPSetup/Product.wxs b/MasterPassword/CSharp/MPSetup/Product.wxs
index 9ab0e171..6d862197 100644
--- a/MasterPassword/CSharp/MPSetup/Product.wxs
+++ b/MasterPassword/CSharp/MPSetup/Product.wxs
@@ -91,5 +91,7 @@
     <WixVariable Id='WixUIDialogBmp' Value='SplashScreen.bmp' />
 
     <Icon Id='masterpassword.ico' SourceFile='$(var.MasterPassword.ProjectDir)\masterpassword.ico' />
+    
+    <Property Id="ARPPRODUCTICON" Value="masterpassword.ico" />
   </Product>
 </Wix>
\ No newline at end of file
diff --git a/MasterPassword/CSharp/MasterPassword/Properties/AssemblyInfo.cs b/MasterPassword/CSharp/MasterPassword/Properties/AssemblyInfo.cs
index d13c9d4f..f1f745ec 100644
--- a/MasterPassword/CSharp/MasterPassword/Properties/AssemblyInfo.cs
+++ b/MasterPassword/CSharp/MasterPassword/Properties/AssemblyInfo.cs
@@ -50,4 +50,4 @@ using System.Runtime.InteropServices;
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyFileVersion("1.3.0.0")]
+[assembly: AssemblyFileVersion("1.4.0.0")]
diff --git a/MasterPassword/CSharp/MasterPassword/frmMain.Designer.cs b/MasterPassword/CSharp/MasterPassword/frmMain.Designer.cs
index c6943ce9..c8905b04 100644
--- a/MasterPassword/CSharp/MasterPassword/frmMain.Designer.cs
+++ b/MasterPassword/CSharp/MasterPassword/frmMain.Designer.cs
@@ -244,6 +244,7 @@ namespace MasterPassword
             // 
             // chkC2C
             // 
+            this.chkC2C.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.chkC2C.AutoSize = true;
             this.chkC2C.Location = new System.Drawing.Point(156, 122);
             this.chkC2C.Name = "chkC2C";
@@ -256,7 +257,7 @@ namespace MasterPassword
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(324, 181);
+            this.ClientSize = new System.Drawing.Size(324, 182);
             this.Controls.Add(this.btnGetPassword);
             this.Controls.Add(this.chkC2C);
             this.Controls.Add(this.btnDelete);
@@ -275,7 +276,7 @@ namespace MasterPassword
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.MaximizeBox = false;
             this.MaximumSize = new System.Drawing.Size(800, 220);
-            this.MinimumSize = new System.Drawing.Size(260, 220);
+            this.MinimumSize = new System.Drawing.Size(320, 220);
             this.Name = "frmMain";
             this.Text = "MasterPassword";
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.frmMain_FormClosing);
diff --git a/MasterPassword/CSharp/MasterPassword/frmMain.cs b/MasterPassword/CSharp/MasterPassword/frmMain.cs
index 046e8f54..01149db7 100644
--- a/MasterPassword/CSharp/MasterPassword/frmMain.cs
+++ b/MasterPassword/CSharp/MasterPassword/frmMain.cs
@@ -99,6 +99,7 @@ namespace MasterPassword
             string appDataPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), Application.ProductName, fileName);
             if (File.Exists(appDataPath))
             {
+                mruData.Clear();
                 string json = "";
                 using (BinaryReader br = new BinaryReader(File.Open(appDataPath, FileMode.Open)))
                 {
@@ -204,8 +205,10 @@ namespace MasterPassword
                 {
                     txtUsername.Text = "";
                     txtPassword.Text = "";
+                    cmbSite.Text = "";
                     cmbType.SelectedIndex = -1;
                     cmbSite.Items.Clear();
+                    mruData.Clear();
                     nudCounter.Value = 1;
                 }
             }