Fix bugs

Author: ErrorNoInternet

download.go

@@ -32,7 +32,7 @@ func startDownload(url string, path string, contentLength int64, outputFile *os.
 			return
 		}
 		for activeWorkers >= workers {
-			time.Sleep(500 * time.Millisecond)
+			time.Sleep(200 * time.Millisecond)
 		}
 		label := fmt.Sprintf("Worker %v/%v", workerId, int64(contentLength/chunkSize))
 		progressBar := widget.NewProgressBar()
@@ -43,17 +43,19 @@ func startDownload(url string, path string, contentLength int64, outputFile *os.
 		}
 		threadContainer.Add(progressBarContainer.container)
 		go downloadChunk(url, path, workerId, outputFile, offset, progressBarContainer)
-		activeWorkers++
+		time.Sleep(50 * time.Millisecond)
 		workerId++
 	}
 	for activeWorkers > 0 {
 		time.Sleep(1 * time.Second)
 	}
-	dialog.ShowInformation("Download Complete", "Your file has been successfully downloaded!", mainWindow)
-	enableDownloads()
+	if downloading {
+		dialog.ShowInformation("Download Complete", "Your file has been successfully downloaded!", mainWindow)
+	}
 }
 
 func downloadChunk(url string, path string, workerId int, outputFile *os.File, offset int64, progressBarContainer *ChunkContainer) {
+	activeWorkers++
 	success := false
 
 	for !success {
@@ -100,14 +102,15 @@ func downloadChunk(url string, path string, workerId int, outputFile *os.File, o
 		)
 		if err != nil {
 			if err.Error() == "cancelled" {
-				break
+				activeWorkers--
+				return
 			}
 			dialog.ShowInformation("Error (retrying)", fmt.Sprintf("Worker %v has ran into an error:\n%v", workerId, wrapText(err.Error())), mainWindow)
 			continue
 		}
 		success = true
 	}
 
-	usedContainers = append(usedContainers, progressBarContainer.container)
 	activeWorkers--
+	usedContainers = append(usedContainers, progressBarContainer.container)
 }

main.go

@@ -110,8 +110,14 @@ func main() {
 
 func cleanContainers() {
 	for downloading || activeWorkers >= 1 {
-		for _, container := range usedContainers {
+		removeIndex := -1
+		for index, container := range usedContainers {
 			threadContainer.Remove(container)
+			removeIndex = index
+		}
+		fmt.Println(len(usedContainers), activeWorkers)
+		if removeIndex != -1 {
+			usedContainers = append(usedContainers[:removeIndex], usedContainers[removeIndex+1:]...)
 		}
 		threadContainer.Refresh()
 		time.Sleep(50 * time.Millisecond)
@@ -122,6 +128,8 @@ func enableDownloads() {
 	downloadButton.SetText("Download")
 	downloadButton.Enable()
 	downloading = false
+	activeWorkers = 0
+	usedContainers = []*fyne.Container{}
 	threadContainer.RemoveAll()
 	threadContainer.Add(layout.NewSpacer())
 	threadContainer.Add(fyne.NewContainerWithLayout(layout.NewCenterLayout(), widget.NewLabel("There are no active workers...")))
@@ -211,9 +219,7 @@ func startDownloadManager(urlEntry *widget.Entry, pathEntry *widget.Entry) {
 	}
 
 	startDownload(url, path, contentLength, outputFile)
-	if downloading {
-		enableDownloads()
-	}
+	enableDownloads()
 }
 
 func showAdvancedOptions() {