defend against pathological cases

rstudio · Oct 1, 2019 · dbb6c68 · dbb6c68
1 parent 46ced5c
commit dbb6c68
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/src/cpp/session/SessionModuleContext.cpp b/src/cpp/session/SessionModuleContext.cpp
@@ -1072,6 +1072,16 @@ FilePath findProgram(const std::string& name)
 
 bool addTinytexToPathIfNecessary()
 {
+   // avoid some pathological cases where e.g. TinyTeX folder
+   // exists but doesn't have the pdflatex binary (don't
+   // attempt to re-add the folder multiple times)
+   static bool s_added = false;
+   if (s_added)
+      return true;
+
+   if (!module_context::findProgram("pdflatex").empty())
+      return false;
+
    std::string binDir;
    Error error = r::exec::RFunction(".rs.tinytexBin").call(&binDir);
    if (error)
@@ -1081,6 +1091,7 @@ bool addTinytexToPathIfNecessary()
    if (!binPath.exists())
       return false;
 
+   s_added = true;
    core::system::addToSystemPath(binPath);
    return true;
 }