bar finish in wrong spot

schollz · schollz · commit 53e0585f2171 · 2018-07-10T13:59:44.000-07:00
diff --git a/src/client.go b/src/client.go
@@ -484,7 +484,6 @@ func (c *Croc) dialUp() (err error) {
 				log.Debugf("receiving file into %s", receiveFileName)
 				err = c.receiveFile(receiveFileName, i, connection)
 			}
-			c.bar.Finish()
 			errorChan <- err
 		}(channel, uuid, port, i, errorChan)
 	}
@@ -499,6 +498,9 @@ func (c *Croc) dialUp() (err error) {
 			c.cs.channel.ws.WriteJSON(c.cs.channel)
 		}
 	}
+	// close bar
+	c.bar.Finish()
+	// measure transfer time
 	c.cs.Lock()
 	c.cs.channel.transferTime = time.Since(c.cs.channel.startTransfer)
 	c.cs.Unlock()

Original file line number	Diff line number	Diff line change
`@@ -484,7 +484,6 @@ func (c *Croc) dialUp() (err error) {`
`484`	`484`	`log.Debugf("receiving file into %s", receiveFileName)`
`485`	`485`	`err = c.receiveFile(receiveFileName, i, connection)`
`486`	`486`	`}`
`487`		`- c.bar.Finish()`
`488`	`487`	`errorChan <- err`
`489`	`488`	`}(channel, uuid, port, i, errorChan)`
`490`	`489`	`}`
`@@ -499,6 +498,9 @@ func (c *Croc) dialUp() (err error) {`
`499`	`498`	`c.cs.channel.ws.WriteJSON(c.cs.channel)`
`500`	`499`	`}`
`501`	`500`	`}`
	`501`	`+ // close bar`
	`502`	`+ c.bar.Finish()`
	`503`	`+ // measure transfer time`
`502`	`504`	`c.cs.Lock()`
`503`	`505`	`c.cs.channel.transferTime = time.Since(c.cs.channel.startTransfer)`
`504`	`506`	`c.cs.Unlock()`