CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-10-05 20:54:31 +13:00
Code Issues Projects Releases Packages Wiki Activity

After import update main window settings

Browse source
This commit is contained in:
Jaex 2016-02-12 00:37:13 +02:00
parent 13e928a6df
commit aeecd30850
2 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ShareX/Forms/ApplicationSettingsForm.cs
View file

@ -470,10 +470,13 @@ private void btnExport_Click(object sender, EventArgs e)
ExportImportManager.Export(sfd.FileName); ExportImportManager.Export(sfd.FileName);
}, },
() => () =>
{
if (!IsDisposed)
{ {
pbExportImport.Visible = false; pbExportImport.Visible = false;
btnExport.Enabled = true; btnExport.Enabled = true;
btnImport.Enabled = true; btnImport.Enabled = true;
}
}); });
} }
} }
@ -497,11 +500,16 @@ private void btnImport_Click(object sender, EventArgs e)
Program.LoadAllSettings(); Program.LoadAllSettings();
}, },
() => () =>
{
if (!IsDisposed)
{ {
UpdateSettings(); UpdateSettings();
pbExportImport.Visible = false; pbExportImport.Visible = false;
btnExport.Enabled = true; btnExport.Enabled = true;
btnImport.Enabled = true; btnImport.Enabled = true;
}
Program.MainForm.UpdateSettings();
}); });
} }
} }

2
ShareX/Forms/MainForm.cs
View file

@ -523,7 +523,7 @@ private void CleanCustomClipboardFormats()
} }
} }
private void UpdateSettings() public void UpdateSettings()
{ {
niTray.Visible = Program.Settings.ShowTray; niTray.Visible = Program.Settings.ShowTray;