Close #3299: bootstrapLib() should always call setCurrentTheme() when…

… shiny is running (#3300)
rstudio · Mar 26, 2021 · 268c9af · 268c9af
1 parent 5c919ae
commit 268c9af
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/R/bootstrap.R b/R/bootstrap.R
@@ -91,6 +91,10 @@ getLang <- function(ui) {
 #' @export
 bootstrapLib <- function(theme = NULL) {
   tagFunction(function() {
+    if (isRunning()) {
+      setCurrentTheme(theme)
+    }
+
     # If we're not compiling Bootstrap Sass (from bslib), return the
     # static Bootstrap build.
     if (!is_bs_theme(theme)) {
@@ -112,7 +116,6 @@ bootstrapLib <- function(theme = NULL) {
     # Note also that since this is shinyOptions() (and not options()), the
     # option is automatically reset when the app (or session) exits
     if (isRunning()) {
-      setCurrentTheme(theme)
       registerThemeDependency(bs_theme_deps)
 
     } else {