don't skip executed alternate engine chunks with errors (fixes #1668)

rstudio · Nov 16, 2017 · 25f09e7 · 25f09e7
1 parent 2562dbd
commit 25f09e7
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/cpp/session/modules/rmarkdown/NotebookQueue.cpp b/src/cpp/session/modules/rmarkdown/NotebookQueue.cpp
@@ -437,11 +437,16 @@ class NotebookQueue : boost::noncopyable
             execUnit_ = unit;
 
             enqueueExecStateChanged(ChunkExecStarted, options.chunkOptions());
-            error = executeAlternateEngineChunk(
+
+            // actually execute the chunk with the alternate engine; store the error separately
+            // and log if necessary
+            Error execError = executeAlternateEngineChunk(
                unit->docId(), unit->chunkId(), ctx, docQueue->workingDir(),
                engine, innerCode, options.mergedOptions());
-            if (error)
-               LOG_ERROR(error);
+            if (execError)
+            {
+               LOG_ERROR(execError);
+            }
          }
       }