Merge pull request #733 from TimTaylor/main

Fix #621
r-lib · Oct 17, 2024 · 20f41c8 · 20f41c8
2 parents 9fc1bbd + dfe880b
commit 20f41c8
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/R/aab-rstudio-detect.R b/R/aab-rstudio-detect.R
@@ -32,8 +32,13 @@ rstudio <- local({
       args = commandArgs(),
       search = search()
     )
-    d$ver <- if (d$api) asNamespace("rstudioapi")$getVersion()
-    d$desktop <- if (d$api) asNamespace("rstudioapi")$versionInfo()$mode
+
+    if (d$api) {
+      ns <- asNamespace("rstudioapi")
+      d$ver <- if (d$api) ns$getVersion()
+      new_api <- package_version(getNamespaceVersion(ns)) >= "0.17.0"
+      d$desktop <- if (new_api) ns$getMode() else ns$versionInfo()$mode
+    }
 
     d
   }