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

22
ShareX/Forms/ApplicationSettingsForm.cs
View file

@ -471,9 +471,12 @@ private void btnExport_Click(object sender, EventArgs e)
}, },
() => () =>
{ {
pbExportImport.Visible = false; if (!IsDisposed)
btnExport.Enabled = true; {
btnImport.Enabled = true; pbExportImport.Visible = false;
btnExport.Enabled = true;
btnImport.Enabled = true;
}
}); });
} }
} }
@ -498,10 +501,15 @@ private void btnImport_Click(object sender, EventArgs e)
}, },
() => () =>
{ {
UpdateSettings(); if (!IsDisposed)
pbExportImport.Visible = false; {
btnExport.Enabled = true; UpdateSettings();
btnImport.Enabled = true; pbExportImport.Visible = false;
btnExport.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;