Learning/mRemoteNG
1
0
Fork 0
mirror of https://github.com/mRemoteNG/mRemoteNG.git synced 2026-02-17 22:11:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed small bug with the PasswordForm when it gets loaded multiple times

Browse Source
This commit is contained in:
David Sparer
2017-02-14 10:36:22 -07:00
parent f40a1b6de8
commit ec0338bb30
2 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mRemoteV1/UI/Forms/PasswordForm.Designer.cs generated
View File

@@ -38,8 +38,8 @@ namespace mRemoteNG.UI.Forms
this.btnCancel = new System.Windows.Forms.Button();
this.lblStatus = new System.Windows.Forms.Label();
this.pbLock = new System.Windows.Forms.PictureBox();
this.txtVerify = new TextBox();
this.txtPassword = new TextBox();
this.txtVerify = new mRemoteNG.UI.Forms.TextBox();
this.txtPassword = new mRemoteNG.UI.Forms.TextBox();
((System.ComponentModel.ISupportInitialize)(this.pbLock)).BeginInit();
this.SuspendLayout();
//
@@ -48,7 +48,7 @@ namespace mRemoteNG.UI.Forms
this.lblPassword.AutoSize = true;
this.lblPassword.Location = new System.Drawing.Point(82, 12);
this.lblPassword.Name = "lblPassword";
this.lblPassword.Size = new System.Drawing.Size(64, 15);
this.lblPassword.Size = new System.Drawing.Size(56, 13);
this.lblPassword.TabIndex = 1;
this.lblPassword.Text = "Password:";
//
@@ -57,7 +57,7 @@ namespace mRemoteNG.UI.Forms
this.lblVerify.AutoSize = true;
this.lblVerify.Location = new System.Drawing.Point(82, 51);
this.lblVerify.Name = "lblVerify";
this.lblVerify.Size = new System.Drawing.Size(39, 15);
this.lblVerify.Size = new System.Drawing.Size(36, 13);
this.lblVerify.TabIndex = 3;
this.lblVerify.Text = "Verify:";
//
@@ -155,6 +155,7 @@ namespace mRemoteNG.UI.Forms
this.ShowInTaskbar = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "Password";
this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.PasswordForm_FormClosed);
this.Load += new System.EventHandler(this.frmPassword_Load);
((System.ComponentModel.ISupportInitialize)(this.pbLock)).EndInit();
this.ResumeLayout(false);

20
mRemoteV1/UI/Forms/PasswordForm.cs
View File

@@ -9,6 +9,7 @@ namespace mRemoteNG.UI.Forms
public partial class PasswordForm : IPasswordRequestor
{
private readonly string _passwordName;
private SecureString _password = new SecureString();
private bool Verify { get; }
@@ -22,9 +23,9 @@ namespace mRemoteNG.UI.Forms
public SecureString RequestPassword()
{
var dialog = ShowDialog();
return dialog == DialogResult.OK ?
(Verify ? txtVerify.Text : txtPassword.Text).ConvertToSecureString() :
new SecureString();
return dialog == DialogResult.OK
? _password
: new SecureString();
}
#region Event Handlers
@@ -38,7 +39,16 @@ namespace mRemoteNG.UI.Forms
txtVerify.Visible = false;
}
private void btnCancel_Click(object sender, EventArgs e)
private void PasswordForm_FormClosed(object sender, FormClosedEventArgs e)
{
_password = txtPassword.Text.ConvertToSecureString();
txtPassword.Text = "";
txtVerify.Text = "";
if (Verify) return;
Height = Height + (txtVerify.Top - txtPassword.Top);
}
private void btnCancel_Click(object sender, EventArgs e)
{
DialogResult = DialogResult.Cancel;
Close();
@@ -93,5 +103,5 @@ namespace mRemoteNG.UI.Forms
lblStatus.Visible = false;
}
#endregion
}
}
}