Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update UI only after save settings #9025

Merged
1 commit merged into from Mar 21, 2021
Merged

Update UI only after save settings #9025

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions GitUI/CommandsDialogs/FormSettings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,8 @@ private bool Save()
// TODO: this method has a generic sounding name but only saves some specific settings
AppSettings.SaveSettings();

DialogResult = DialogResult.OK;

return true;
}
catch (SaveSettingsException ex) when (ex.InnerException is not null)
Expand Down
5 changes: 2 additions & 3 deletions GitUI/GitUICommands.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -902,9 +902,8 @@ public bool StartSettingsDialog(IWin32Window? owner = null, SettingsPageReferenc
{
bool Action()
{
FormSettings.ShowSettingsDialog(this, owner, initialPage);

return true;
return FormSettings.ShowSettingsDialog(this, owner, initialPage)
is DialogResult.OK;
}

return DoActionOnRepo(owner, Action, requiresValidWorkingDir: false, postEvent: PostSettings);
Expand Down