go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-17 01:42:45 +02:00
Code Issues Releases Activity

Prevent crash when opening in small window

Browse Source 
We were crashing when opening lazygit in a small window because the limit view
was the only view that got created, and there were two functions that referenced
either the 'current' view or the files view, neither of which existed.

Now those functions just return nil if the view does not exist
This commit is contained in:
Jesse Duffield
2019-05-06 22:29:35 +10:00
parent e09aac6450
commit 2746b1bd38
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/gui/context.go
View File

@ -21,7 +21,11 @@ func (gui *Gui) contextTitleMap() map[string]map[string]string {
} }
func (gui *Gui) setMainTitle() error { func (gui *Gui) setMainTitle() error {
currentViewName := gui.g.CurrentView().Name() currentView := gui.g.CurrentView()
if currentView == nil {
return nil
}
currentViewName := currentView.Name()
var newTitle string var newTitle string
if context, ok := gui.State.Contexts[currentViewName]; ok { if context, ok := gui.State.Contexts[currentViewName]; ok {
newTitle = gui.contextTitleMap()[currentViewName][context] newTitle = gui.contextTitleMap()[currentViewName][context]

4
pkg/gui/files_panel.go
View File

@ -86,6 +86,10 @@ func (gui *Gui) refreshFiles() error {
selectedFile, _ := gui.getSelectedFile(gui.g) selectedFile, _ := gui.getSelectedFile(gui.g)
filesView := gui.getFilesView() filesView := gui.getFilesView()
if filesView == nil {
// if the filesView hasn't been instantiated yet we just return
return nil
}
if err := gui.refreshStateFiles(); err != nil { if err := gui.refreshStateFiles(); err != nil {
return err return err
} }