prevent crash when removing remote with no urls

Merge pull request #1051 from jesseduffield/go-1.10-compat
gui: fix go-1.10 compatibility
2026-09-29 02:35:39 -04:00 · 2020-11-05 20:16:08 +11:00 · 2020-10-14 12:53:29 +02:00 · 2020-10-14 12:43:31 +02:00
2 changed files with 2 additions and 2 deletions
@@ -21,7 +21,7 @@ func recordEventsTo() string {
 }

 func (gui *Gui) timeSinceStart() int64 {
-	return time.Since(gui.StartTime).Milliseconds()
+	return time.Since(gui.StartTime).Nanoseconds() / 1e6
 }

 func (gui *Gui) replayRecordedEvents() {
@@ -106,7 +106,7 @@ func (gui *Gui) handleRemoveRemote(g *gocui.Gui, v *gocui.View) error {
 		prompt: gui.Tr.LcRemoveRemotePrompt + " '" + remote.Name + "'?",
 		handleConfirm: func() error {
 			if err := gui.GitCommand.RemoveRemote(remote.Name); err != nil {
-				return err
+				return gui.surfaceError(err)
 			}

 			return gui.refreshSidePanels(refreshOptions{scope: []int{BRANCHES, REMOTES}})
Author	SHA1	Message	Date
Jesse Duffield	4b55b2e7fc	prevent crash when removing remote with no urls	2020-11-05 20:16:08 +11:00
Dawid Dziurla	7c1889cd70	Merge pull request #1051 from jesseduffield/go-1.10-compat gui: fix go-1.10 compatibility	2020-10-14 12:53:29 +02:00
Dawid Dziurla	5669cc0002	gui: fix go-1.10 compatibility	2020-10-14 12:43:31 +02:00