Make R check happy.

IVFL-BOKU · Dec 18, 2018 · 5f94c7c · 5f94c7c
1 parent 640add3
commit 5f94c7c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/R/S2_download.R b/R/S2_download.R
@@ -75,17 +75,18 @@ S2_download = function(url, destfile, zip = TRUE, skipExisting = TRUE, progressB
 
   success = rep(FALSE, length(url))
   if (progressBar) {
-    pb = txtProgressBar(0, length(url), style = 3)
+    pb = utils::txtProgressBar(0, length(url), style = 3)
   }
   for (i in seq_along(url)) {
     if (isTRUE(skipExisting) && file.exists(destfile[i])) {
       next
     }
 
     if (progressBar) {
-      setTxtProgressBar(pb, i)
+      utils::setTxtProgressBar(pb, i)
     }
 
+    breakLoop = FALSE
     tryCatch(
       {
         curl::curl_download(url = url[i], destfile = destfile[i], quiet = TRUE)
@@ -102,10 +103,13 @@ S2_download = function(url, destfile, zip = TRUE, skipExisting = TRUE, progressB
       },
       warning = function(w) {
         if (all(w$message == 'Operation was aborted by an application callback')) {
-          break
+          breakLoop <<- TRUE
         }
       }
     )
+    if (breakLoop) {
+      break
+    }
   }
 
   return(invisible(success))

diff --git a/man/S2_download.Rd b/man/S2_download.Rd