Handle edge cases.

dmurdoch · Oct 3, 2023 · 611f589 · 611f589
1 parent 1e3b630
commit 611f589
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/R/bgplot3d.R b/R/bgplot3d.R
@@ -1,8 +1,12 @@
 safe.dev.off  <- function(which = dev.cur(), prev = dev.prev()) {
-  force(prev)
-  grDevices::dev.off(which)
+  if (which != 1) {
+    force(prev)
+    grDevices::dev.off(which)
+  }
   if (length(dev.list()))
     dev.set(prev)
+  else
+    c("null device" = 1)
 }
 
 dev.off <- function(...) stop("Use safe.dev.off() instead!")

diff --git a/man/safe.dev.off.Rd b/man/safe.dev.off.Rd
@@ -18,8 +18,14 @@ Which device to close.
 Which device to set as current after closing.
 }
 }
+\details{
+This function closes device \code{which} if it is not device 1,
+then calls \code{\link{dev.set(prev)}} if there are any devices still
+open.
+}
 \value{
-The number and name of the new active device.
+The number and name of the new active device.  It will not 
+necessarily be \code{prev} if that device isn't already open.
 }
 \references{
 \url{https://bugs.r-project.org/show_bug.cgi?id=18604}