Merge pull request #3593 from ivandrofly/settings-2

settings: don't refresh controls when user cancel settings changes
This commit is contained in:
Nikolaj Olsson 2019-08-10 18:49:47 +02:00 committed by GitHub
commit 2ec14d62ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -4290,7 +4290,12 @@ namespace Nikse.SubtitleEdit.Forms
settings.Initialize(Icon, toolStripButtonFileNew.Image, toolStripButtonFileOpen.Image, toolStripButtonSave.Image, toolStripButtonSaveAs.Image, toolStripButtonFind.Image,
toolStripButtonReplace.Image, toolStripButtonFixCommonErrors.Image, toolStripButtonRemoveTextForHi.Image, toolStripButtonVisualSync.Image,
toolStripButtonSpellCheck.Image, toolStripButtonNetflixQualityCheck.Image, toolStripButtonSettings.Image, toolStripButtonHelp.Image);
settings.ShowDialog(this);
// settings update canceled
if (settings.ShowDialog(this) == DialogResult.Cancel)
{
return;
}
}
try