fix crash on first open

Author: jesseduffield

pkg/gui/gui.go

@@ -515,15 +515,6 @@ func (gui *Gui) Run() error {
 		return err
 	}
 
-	if !gui.Config.GetUserConfig().DisableStartupPopups {
-		popupTasks := []func(chan struct{}) error{}
-		storedPopupVersion := gui.Config.GetAppState().StartupPopupVersion
-		if storedPopupVersion < StartupPopupVersion {
-			popupTasks = append(popupTasks, gui.showIntroPopupMessage)
-		}
-		gui.showInitialPopups(popupTasks)
-	}
-
 	gui.waitForIntro.Add(1)
 	if gui.Config.GetUserConfig().Git.AutoFetch {
 		go utils.Safe(gui.startBackgroundFetch)

pkg/gui/layout.go

@@ -375,6 +375,15 @@ func (gui *Gui) onInitialViewsCreation() error {
 		return err
 	}
 
+	if !gui.Config.GetUserConfig().DisableStartupPopups {
+		popupTasks := []func(chan struct{}) error{}
+		storedPopupVersion := gui.Config.GetAppState().StartupPopupVersion
+		if storedPopupVersion < StartupPopupVersion {
+			popupTasks = append(popupTasks, gui.showIntroPopupMessage)
+		}
+		gui.showInitialPopups(popupTasks)
+	}
+
 	if gui.showRecentRepos {
 		if err := gui.handleCreateRecentReposMenu(); err != nil {
 			return err

test/integration/initialOpen/config/config.yml

@@ -0,0 +1 @@
+asd

test/integration/initialOpen/expected/.git_keep/COMMIT_EDITMSG

@@ -0,0 +1 @@
+ref: refs/heads/master

test/integration/initialOpen/expected/.git_keep/FETCH_HEAD

@@ -0,0 +1,10 @@
+[core]
+	repositoryformatversion = 0
+	filemode = true
+	bare = false
+	logallrefupdates = true
+	ignorecase = true
+	precomposeunicode = true
+[user]
+	email = [email protected]
+	name = CI

test/integration/initialOpen/expected/.git_keep/HEAD

@@ -0,0 +1 @@
+Unnamed repository; edit this file 'description' to name the repository.

test/integration/initialOpen/expected/.git_keep/config

@@ -0,0 +1,7 @@
+# git ls-files --others --exclude-from=.git/info/exclude
+# Lines that start with '#' are comments.
+# For a project mostly in C, the following would be a good set of
+# exclude patterns (uncomment them if you want to use them):
+# *.[oa]
+# *~
+.DS_Store