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

simply close options form instead of reverting settings, fixes #1610

Browse Source
This commit is contained in:
Faryan Rezagholi
2019-10-03 16:56:57 +02:00
parent 75a453e598
commit a9c4d0dee5
3 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -9,6 +9,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
### Changed
- #1460: Updated GeckoFX to v60
### Fixed
- #1610: Menu bar changes to english when cancelling options form
- #1595: Unhandled exception when trying to browse through non existent multi ssh history with keyboard key strokes
- #1337: Unhandled exception after closing mRemoteNG
- #359: Making a VNC connection to an unreachable host causes the application to not respond for 20-30 seconds

6
mRemoteV1/UI/Forms/frmOptions.Designer.cs generated
View File

@@ -62,7 +62,7 @@
this.btnApply.TabIndex = 2;
this.btnApply.Text = "Apply";
this.btnApply.UseVisualStyleBackColor = true;
this.btnApply.Click += new System.EventHandler(this.btnOK_Click);
this.btnApply.Click += new System.EventHandler(this.BtnOK_Click);
//
// btnCancel
//
@@ -74,7 +74,7 @@
this.btnCancel.TabIndex = 1;
this.btnCancel.Text = "Cancel";
this.btnCancel.UseVisualStyleBackColor = true;
this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
this.btnCancel.Click += new System.EventHandler(this.BtnCancel_Click);
//
// btnOK
//
@@ -86,7 +86,7 @@
this.btnOK.TabIndex = 0;
this.btnOK.Text = "OK";
this.btnOK.UseVisualStyleBackColor = true;
this.btnOK.Click += new System.EventHandler(this.btnOK_Click);
this.btnOK.Click += new System.EventHandler(this.BtnOK_Click);
//
// splitter1
//

13
mRemoteV1/UI/Forms/frmOptions.cs
View File

@@ -5,6 +5,7 @@ using System.Diagnostics;
using System.Linq;
using System.Windows.Forms;
using mRemoteNG.Themes;
using mRemoteNG.Tools;
namespace mRemoteNG.UI.Forms
{
@@ -120,7 +121,7 @@ namespace mRemoteNG.UI.Forms
* OK sets DialogResult = OK, Apply does not (None).
* Apply will no close the dialog.
*/
private void btnOK_Click(object sender, EventArgs e)
private void BtnOK_Click(object sender, EventArgs e)
{
foreach (var page in _pages.Values)
{
@@ -142,15 +143,9 @@ namespace mRemoteNG.UI.Forms
pnlMain.Controls.Add(page);
}
private void btnCancel_Click(object sender, EventArgs e)
private void BtnCancel_Click(object sender, EventArgs e)
{
foreach (var page in _pages.Values)
{
Debug.WriteLine(page.PageName);
page.RevertSettings();
}
Debug.WriteLine(AppDomain.CurrentDomain.SetupInformation.ConfigurationFile);
Close();
}
}
}