unlock opts_current before restoring it

chuxinyuan · Aug 30, 2023 · 3245aab · 3245aab
1 parent 7cd115a
commit 3245aab
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/R/block.R b/R/block.R
@@ -52,7 +52,7 @@ call_block = function(block) {
   }
 
   # save current chunk options in opts_current
-  opts_current$restore(params)
+  opts_current$unlock(); opts_current$restore(params)
 
   if (opts_knit$get('progress')) print(block)
 

diff --git a/R/output.R b/R/output.R
@@ -152,10 +152,13 @@ knit = function(
     )
     on.exit(options(oopts), add = TRUE)
     # restore chunk options after parent exits
-    optc = opts_chunk$get(); on.exit(opts_chunk$restore(optc), add = TRUE)
-    ocode = knit_code$get(); on.exit(knit_code$restore(ocode), add = TRUE)
-    on.exit(opts_current$restore(), add = TRUE)
-    optk = opts_knit$get(); on.exit(opts_knit$restore(optk), add = TRUE)
+    optc = opts_chunk$get(); ocode = knit_code$get(); optk = opts_knit$get()
+    on.exit({
+      opts_chunk$restore(optc)
+      knit_code$restore(ocode)
+      opts_current$unlock(); opts_current$restore()
+      opts_knit$restore(optk)
+    }, add = TRUE)
     opts_knit$set(
       output.dir = getwd(),  # record working directory in 1st run
       tangle = tangle, progress = opts_knit$get('progress') && !quiet