diff --git a/src/Resources/Locales/en_US.xaml b/src/Resources/Locales/en_US.xaml index 99550ddc..933c3ff2 100644 --- a/src/Resources/Locales/en_US.xaml +++ b/src/Resources/Locales/en_US.xaml @@ -415,6 +415,9 @@ Revert merge request detected! Press 'Abort' to restore original HEAD Merge request detected! Press 'Abort' to restore original HEAD + NOTICE + Restart required to apply changes in preference. Restart now? + Git has NOT been configured.\nPlease to go [Preference] and configure it first. Path[{0}] not exists! Can NOT locate bash.exe. Make sure bash.exe exists under the same folder with git.exe diff --git a/src/Resources/Locales/zh_CN.xaml b/src/Resources/Locales/zh_CN.xaml index 3b203569..5e436495 100644 --- a/src/Resources/Locales/zh_CN.xaml +++ b/src/Resources/Locales/zh_CN.xaml @@ -415,6 +415,9 @@ 检测到回滚提交冲突! 检测到分支合并冲突! + 系统提示 + 本次配置变更需要在重启后生效,是否立即重启? + GIT尚未配置。请打开【偏好设置】配置GIT路径。 路径({0})不存在或不可读取! 无法找到bash.exe,请确保其在git.exe同目录中! diff --git a/src/Views/Preference.xaml.cs b/src/Views/Preference.xaml.cs index e975324b..19cedc54 100644 --- a/src/Views/Preference.xaml.cs +++ b/src/Views/Preference.xaml.cs @@ -121,7 +121,18 @@ namespace SourceGit.Views { useDarkTheme != general.UseDarkTheme || checkUpdate != general.CheckForUpdate || autoFetch != general.AutoFetchRemotes) { - App.Restart(); + var result = MessageBox.Show( + this, + App.Text("Restart.Content"), + App.Text("Restart.Title"), + MessageBoxButton.OKCancel, + MessageBoxImage.Question, + MessageBoxResult.Cancel); + if (result == MessageBoxResult.OK) { + App.Restart(); + } else { + Close(); + } } else { Close(); }