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

changed setting saver method signature to require frmmain rather than using static singleton variable

Browse Source
This commit is contained in:
David Sparer
2017-05-07 16:08:50 -06:00
parent 450c9bb755
commit d2b6429c8b
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mRemoteV1/App/Shutdown.cs
View File

@@ -25,14 +25,14 @@ namespace mRemoteNG.App
ProgramRoot.CloseSingletonInstanceMutex();
}
public static void Cleanup(Control quickConnectToolStrip, ExternalToolsToolStrip externalToolsToolStrip)
public static void Cleanup(Control quickConnectToolStrip, ExternalToolsToolStrip externalToolsToolStrip, FrmMain frmMain)
{
try
{
StopPuttySessionWatcher();
DisposeNotificationAreaIcon();
SaveConnections();
SaveSettings(quickConnectToolStrip, externalToolsToolStrip);
SaveSettings(quickConnectToolStrip, externalToolsToolStrip, frmMain);
UnregisterBrowsers();
}
catch (Exception ex)
@@ -58,9 +58,9 @@ namespace mRemoteNG.App
Runtime.SaveConnections();
}
private static void SaveSettings(Control quickConnectToolStrip, ExternalToolsToolStrip externalToolsToolStrip)
private static void SaveSettings(Control quickConnectToolStrip, ExternalToolsToolStrip externalToolsToolStrip, FrmMain frmMain)
{
Config.Settings.SettingsSaver.SaveSettings(quickConnectToolStrip, externalToolsToolStrip);
Config.Settings.SettingsSaver.SaveSettings(quickConnectToolStrip, externalToolsToolStrip, frmMain);
}
private static void UnregisterBrowsers()

3
mRemoteV1/Config/Settings/SettingsSaver.cs
View File

@@ -11,11 +11,10 @@ namespace mRemoteNG.Config.Settings
{
public static class SettingsSaver
{
public static void SaveSettings(Control quickConnectToolStrip, ExternalToolsToolStrip externalToolsToolStrip)
public static void SaveSettings(Control quickConnectToolStrip, ExternalToolsToolStrip externalToolsToolStrip, FrmMain frmMain)
{
try
{
var frmMain = FrmMain.Default;
var windowPlacement = new WindowPlacement(FrmMain.Default);
if (frmMain.WindowState == FormWindowState.Minimized & windowPlacement.RestoreToMaximized)
{

2
mRemoteV1/UI/Forms/frmMain.cs
View File

@@ -297,7 +297,7 @@ namespace mRemoteNG.UI.Forms
}
}
Shutdown.Cleanup(_quickConnectToolStrip, _externalToolsToolStrip);
Shutdown.Cleanup(_quickConnectToolStrip, _externalToolsToolStrip, this);
IsClosing = true;