go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-04-21 12:16:54 +02:00
Code Issues Releases Activity

reload config whenever returning to gui

Browse Source
This commit is contained in:
Jesse Duffield 2021-02-23 23:01:45 +11:00
parent a62d70fbd5
commit 043cb2ea44
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/config/app_config.go
View File

@ -41,6 +41,7 @@ type AppConfigurer interface {
SaveAppState() error SaveAppState() error
SetIsNewRepo(bool) SetIsNewRepo(bool)
GetIsNewRepo() bool GetIsNewRepo() bool
ReloadUserConfig() error
} }
// NewAppConfig makes a new app config // NewAppConfig makes a new app config
@ -203,6 +204,16 @@ func (c *AppConfig) GetUserConfigDir() string {
return c.UserConfigDir return c.UserConfigDir
} }
func (c *AppConfig) ReloadUserConfig() error {
userConfig, err := loadUserConfigWithDefaults(c.UserConfigDir)
if err != nil {
return err
}
c.UserConfig = userConfig
return nil
}
func configFilePath(filename string) (string, error) { func configFilePath(filename string) (string, error) {
folder, err := findOrCreateConfigDir() folder, err := findOrCreateConfigDir()
if err != nil { if err != nil {

3
pkg/gui/gui.go
View File

@ -464,6 +464,9 @@ func (gui *Gui) Run() error {
} }
g.OnSearchEscape = gui.onSearchEscape g.OnSearchEscape = gui.onSearchEscape
if err := gui.Config.ReloadUserConfig(); err != nil {
return nil
}
userConfig := gui.Config.GetUserConfig() userConfig := gui.Config.GetUserConfig()
g.SearchEscapeKey = gui.getKey(userConfig.Keybinding.Universal.Return) g.SearchEscapeKey = gui.getKey(userConfig.Keybinding.Universal.Return)
g.NextSearchMatchKey = gui.getKey(userConfig.Keybinding.Universal.NextMatch) g.NextSearchMatchKey = gui.getKey(userConfig.Keybinding.Universal.NextMatch)